Bug 966790: Handle unidling consistently in the cart model
WIP Cartridge Refactor - remove extraneous syslog messages
Fix bug 966330 - fix authorizations and ssh keys for responsive layouts
Bug 967016: Detect v2 carts in a gear more accurately
vendoring of cartridges
fix some broken tests
Replace pre-receive cart control action with pre-repo-archive

There is no longer any use case for the pre-receive control action. Replace it with
a pre-repo-archive control action which occurs during the build cycle during Git
post-receive but before the Git repository is exported to OPENSHIFT_REPO_DIR. This
supports a known use case (Ruby asset management).
Merge pull request #2629 from ironcladlou/bz/966790

Merged by openshift-bot
Merge pull request #2637 from jwhonce/wip/oo-trap-user

Merged by openshift-bot
Merge pull request #2635 from liggitt/bug_966330_authorization_keys_responsive_layout

Merged by openshift-bot
Merge pull request #2636 from ironcladlou/bz/967016

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

Merged by openshift-bot
Bug 967118 - Make Platform/Cartridge shared files immutable

* Add OpenShift::ManagedFiles::IMMUTABLE_FILES
* Remove immutable files from all lock/unlock lists
* Refactor cartridge create to protect these files
Bug 967118 - Remove redundant entries from managed_files.yml

* Removed all occurances where locked_files was protecting just managed_files.yml
  and manifest.yml. Platform ensures those are immutable.
Merge pull request #2641 from ironcladlou/dev/v2carts/build-system

Merged by openshift-bot
Merge pull request #2642 from jwhonce/bug/967118

Merged by openshift-bot
Various cleanup
Merge pull request #2643 from danmcp/master

Merged by openshift-bot
Bug 962657: Return db info to client during postgres install
Bug 966963: Remove unnecessary versioned conf files from php cart

The php 5.3/5.4 configuration files all symlink back to shared. Remove the specific version
directories/files and use only the shared directory for setup. This also fixes a bug where
the symlinks to shared become broken during setup (as ERBs are removed during processing)
and cause the remaining symlinks to be re-processed as ERBs (which fails).