Ensuring consistency for atomically adding/removing pending_op_groups/ssh_keys
fix for 1043588 - get the first web_framework's port interface
Merge pull request #4328 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #4350 from rajatchopra/master

Merged by openshift-bot