Bug 917713
Bug 912010 - Make the 'cartridge' tag match all cartridges
Gemfile.lock ownership fixes

A user on #openshift-dev somehow got into a state where Gemfile.lock had a mode
of 640.  Previously it was owned by root.  It's probably more correct to change
the ownership since the intent is that Apache should _always_ be able to read
that file.
Move test case into rest_api_test.rb
Bug 917713
Bug 902118 - Removing generated hidden form fields

When changing application type modes, the rails generated hidden
fields are stripped out.
Make v2 get_cartridge use instance dir instead of system path
Merge pull request #1534 from liggitt/bug_912010_cartridge_filter_empty_results

Bug 912010 - Make the 'cartridge' tag match all cartridges
Bug 916918 - Couple of issues with frontend calls.
Merge pull request #1543 from danmcp/master

Bug 917163
Merge pull request #1539 from jtharris/bugs/BZ902118

Bug 902118 - Removing generated hidden form fields
Merge pull request #1545 from pmorie/dev/v2_get_cart

Make v2 get_cartridge use instance dir instead of system path
Merge pull request #1541 from bdecoste/master

Merged by openshift-bot
Merge pull request #1546 from rmillner/US3143

Merged by openshift-bot
Skip Usage capture for sub-account users

oo-admin-ctl-usage optimization: create user id => {login, usage_account_id} cache before processing usage records

Use session.with(safe:true) option when updating usage records
Update setup helper to create test ssh key in exclusive lock.
Othrwise was facing race condition where multiple test runs were completing to create the key files.
Merge pull request #1542 from pravisankar/dev/ravi/us3409-fixes

Merged by openshift-bot
Merge pull request #1488 from kraman/fix_parallel_test_run

Merged by openshift-bot
Merge pull request #1535 from brenton/gemfile_lock_fixes

Merged by openshift-bot