Fixing broker extended tests
Setting quota on new gear only if additional storage is specified
Fix FireSass support in origin
Restore uppercase style
- Added Application Lock Timeout (default: 10 mins)
- Unit tests for Lock model
Merge pull request #1300 from abhgupta/abhgupta-dev

Merged by openshift-bot
Bug 907372 - [US3327]Meet error "could not create 'YourAppName.egg-info':
Permission denied" when snapshot restored for python-2.7/python-3.3 apps
Bug 907426 - [US3327]Jenkins build failed for python-2.7/python-3.3 apps
fix issue with reserve given not taking the valid uid
Merge pull request #1301 from smarterclayton/fix_firesass_support

Merged by openshift-bot
Merge pull request #1307 from danmcp/master

Fix issue with reserve given not taking the valid uid
Merge pull request #1302 from smarterclayton/restore_uppercase_bits

Merged by openshift-bot
Merge pull request #1303 from pravisankar/dev/ravi/app-lock-timeout

Merged by openshift-bot
Fix for bug 907683 - Reloading from primary
Merge pull request #1306 from ramr/master

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

Merged by openshift-bot
<oo-accept-broker> fix bug 905656 - exit message and status
<oo-accept-systems> fix bug 893896 - allow -w .5 and improve parameter error report
<oo-stats, oo-diagnostics> allow -w .5, improve options errmsg
Merge pull request #1308 from sosiouxme/accept-scripts

Merged by openshift-bot