Bug 949819
Merge pull request #1977 from lnader/master

Merged by openshift-bot
Anchor locked_files.txt entries at the cart directory
Bug 950224: Remove unnecessary Endpoints
Replace zend with ruby in broker function test as zend is not available on origin.
Merge pull request #1989 from ironcladlou/bz/950224

Merged by openshift-bot
Fix account settings breadcrumb to point to the correct URL
Merge pull request #1990 from kraman/master

Replace zend with ruby in broker function test as zend is not available on origin.
Merge pull request #1988 from ironcladlou/dev/v2carts/locked-files-refactor

Anchor locked_files.txt entries at the cart directory
Fixing cron cart issue with the locked files
Add Python 3.3 support.
Add 'plan_history' to CloudUser model.
oo-admin-ctl-usage will also cache 'plan_history' and will pass to sync_usage().
Merge pull request #1991 from calfonso/master

Merged by openshift-bot
Add social sharing links
Bug 950367 - Handle non-integer values for expires_in

Any param value of expires_in outside the range of 0..max_expires should be treated as the default value.
Bug 928668 - Provide better gear storage messages

Use terminology more in keeping with our UI messaging
Ruby v2 cartridge work
Roll 'build' logic into 'control' script in Ruby cartridge.
Postpone implementing pre-build, post-deploy and threaddump in Ruby v2.
Correct the log directory to clean up during tidy in Ruby v2 cartridge