Fix for bug 1060760: Missing variable assignment for exception
fix the occluded haproxy gear's frontend upon move when two proxy gears clash on a node
fix indentation
Merge pull request #4670 from danmcp/master

Merged by openshift-bot
Merge pull request #4672 from abhgupta/abhgupta-dev

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

Merged by openshift-bot
Merge pull request #4673 from bparees/fix_tabbing

Merged by openshift-bot