Allow to manage multiple Deployments && other minor improvements

cc @jtomasek @knowncitizen @sseago
- ref https://bugzilla.redhat.com/show_bug.cgi?id=1093055
- [x] split into 2 PRs one with multiple deployments, second with the minor improvments which can go to next release