Merge remote-tracking branch 'origin/master' into origin_broker_184_cartridges_in_mongo

Conflicts:
	broker-util/oo-admin-repair
	controller/app/helpers/cartridge_cache.rb
	controller/app/models/application.rb
	controller/app/pending_ops_models/delete_comp_op.rb