Merge proposals dependent on lp://staging/~therp-nl/openupgrade-server/6.1-lp933781_action_attrs_is_undefined

1. 6.1-lp933781_action_attrs_is_undefined
2. Dependent merge proposals