Fix for bug 975586
 - Alowing multiple dashes in alias
Bug 974786: Scaled gear hot deploy logic fix

Make the `gear` script `--hot-deploy` option require an explicit boolean argument
so that the option overrides a repo check for the hot_deploy marker.
Bug 975794: Use install to create volatile environment variables

Variables which are volatile (in that they may be modified later by the cartridge and
are expected to persist between version upgrades) shouldn't be created via the `env`
system in the cartridge unless they are ERB based; otherwise, the variables will overwrite
already created files in instantiated cartridges each time an upgrade occurs.

Create these variables in the `install` script so that they are primed during new cartridge
installation and not touched during subsequent version upgrades.
Bug 975713 - oo-admin-chk fix
Merge pull request #2902 from abhgupta/abhgupta-dev

Merged by openshift-bot
quick fix for 972958 - increase lock timeout
Merge pull request #2903 from ironcladlou/bz/974786

Merged by openshift-bot
Merge pull request #2904 from ironcladlou/bz/975794

Merged by openshift-bot
Merge pull request #2905 from pravisankar/dev/ravi/bug975713

Merged by openshift-bot
Bug 975700 - check the httpd pid file for corruption and attempt to fix it.
Merge pull request #2908 from rajatchopra/master

Merged by openshift-bot
Merge pull request #2909 from rmillner/BZ975700

Merged by openshift-bot