Allow broker to be started using source directly
Move ActionLog to a controller mixin, make core user_action_log independent of controller so it can be used in models
Make user logging stateful to the thread
Remove unnecessary duplicate log statement in domains controller
Remove @request_id
Remove gen_req_uuid and get_cloud_user_info, no longer used
netrc should only be loaded in source mode (test env loads it via a patched gem)
Extract API response behavior to a controller mixin
Separate API behavior into its own model
Make the base url mechanism relative to the Rails root
Remove global references to $requested_api_version
Do not use a global variable to initialize a RestReply - use a controller helper method.
Move the API document handler to its own controller
Ensure lib directory is in the autoload path, do not require rubygems when developing from source
Move authentication logic to a new controller mixin
All controllers should inherit the standard filters, except where they are bypassed
Remove legacy login() method on authservice
change %define to %global

move all variables to top

clean spaces and header order
Merge remote-tracking branch 'origin/master' into improve_action_logging

Conflicts:
	controller/app/controllers/base_controller.rb
	controller/app/helpers/user_action_logger.rb
Add function for placeholder on create app form
include jquery_placeholder for ie9 and older
Merge branch 'improve_action_logging' into isolate_api_behavior_from_base_controller

Conflicts:
	controller/app/controllers/base_controller.rb
Merge pull request #1341 from rajatchopra/master

deep copy of group overrides to help migration maintain a soft cache of cartridges
Bug 885194 - Corrected form handler to suppress submit on form errors
Merge pull request #1342 from sg00dwin/bug-fixes

Merged by openshift-bot