Bumped mcollective version to 2.3.1-2
Merge branch 'master' of git://github.com/sakaiproject/puppet-hilary

* 'master' of git://github.com/sakaiproject/puppet-hilary:
  Using exported host resource
  Using exported host resource
  Using exported host resource
  Using exported host resource
  Using exported host resource
  Using exported host resource
  Using exported host resource
  Adding second mq host
  Making it possible to configure multiple mq hosts
  Making it possible to configure multiple mq hosts
  Making it possible to configure multiple mq hosts
  Making it possible to configure multiple mq hosts
  Adding puppetlabs rabbitmq module
  Removing custom rabbitmq module
  Adding openvpn. Will need it later (a lot later)
Nagios monitoring
The package should be installed before configs are written out.
Nagios PR followup

 * Applying ::oaeservice::nagios in common.json
 * Applying ::oaeservice::nagios::disk and memory in common.json
 * Added shared en tmp space monitoring classes
 * Removed slow elasticsearch script
 * Created ssh firewall class
 * Cleaned up syntax in some puppet files
Removed slow elasticsearch
Make nagios listen on port 80.
Make nagios listen on port 80.
Listening on port 8090 for nagios.
Changing -master notation to numbers. Some little environment changes
Removed tmp/shared disk check from oaeservice::nagios::nginx.
Merge remote-tracking branch 'simong/hiera-nagios' into nagios-merge
Adding homedir for rabbitmq management plugin installation
Fixing up some requires statements
chmod the nagios.cmd file as well.
chmod the nagios.cmd file as well.
chmod the nagios.cmd file as well.
Merge branch 'master' into etherpad-ubuntu

Conflicts:
	modules/oaeservice/manifests/etherpad.pp