Merge puppet1.ose.phx2.redhat.com:/srv/git/puppet into ose

Conflicts:
	modules/setup/manifests/ose_helpers.pp
Merge branch 'ose' of puppet1.ops.rhcloud.com:/srv/git/puppet into ose
Merge branch 'quick' into stg
Merge branch 'quick' into stg
Merge branch 'quick' into stg
Merge branch 'quick' into stg
Add a 'Plain' log formatter
log.rb: Add multi-destination feature and threshold setting
log.rb: add threshold assignment method
log.rb: Ruby 1.9.3 ostruct compatibility
Merge branch 'master' into stg

* master:
  Flock check-accept-node cron job
Merge branch 'acceptnode_pid_capture' into stg
Merge branch 'ose' into stg
Merge branch 'acceptnode_pid_capture' into stg
Merge branch 'sturpin-2014-04-30-acceptnode' into stg
Merge branch 'sturpin-2014-04-30-acceptnode' into stg
Merge branch 'quick' into stg
Merge branch 'roles_and_profiles' into stg

Conflicts:
	modules/li/manifests/controller.pp
	modules/li/manifests/li_node.pp
	modules/oo_zabbix/manifests/userparameter.pp
Merge branch 'roles_and_profiles' into stg
Merge branch 'agrimm/logger' into stg

* agrimm/logger:
  Port ops-fix-high-cpu to new log.rb
  log.rb: Ruby 1.9.3 ostruct compatibility
  log.rb: add threshold assignment method
  log.rb: Add multi-destination feature and threshold setting
  Add a 'Plain' log formatter