Bug 1160494 - Protect Ops stop_gear from cartridge errors
Bug 1160861 - Prevent both frontends installed at same time
Merge pull request #5937 from jwhonce/bug/1160494

Merged by openshift-bot
Merge pull request #5938 from jwhonce/bug/1160861

Merged by openshift-bot
BZ#1160860 - Update routing-daemon.conf setting defaults for NGINX to 1.6
Merge pull request #5942 from calfonso/bz1160860

Merged by openshift-bot
controller: whitespace fixes

vim performs whitespace fixes automatically. I like to separate these
out to avoid obscuring the real changes.
controller: make gear UUIDs predictable

Introduce an option that creates gear UUIDs based on the app name
instead of the standard 24-char hex format.
Enterprise use case:
https://trello.com/c/bUe7eOL6/290-enable-predictable-gear-uuids-ose