Add update_network_conf_files option
Remove comment in cgconfig.conf if it exists from previous runs

Should resolve Issue 301 completely
Merge pull request #315 from sdodson/Issue301

Remove comment in cgconfig.conf if it exists from previous runs
Merge pull request #286 from andrewklau/add_update_network_options

Add update_network_conf_files option
Introduce OSE specific configuration defaults
Clean up install_cartridges a bit more
Merge pull request #314 from sdodson/enterprise-2.2-merge

Introduce OSE specific configuration defaults
Generate metadata.json file and bump version 4.0.11
Merge pull request #316 from sdodson/v4_0_11

Generate metadata.json file and bump version 4.0.11
Wherever we reference apache user add httpd package requirement

This may be implicitly defined in many of the cases, but we'll go ahead
and make the requirement on httpd package explicit wherever we set
owner or group to 'apache'.

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1158271
undef should never be quoted
Merge pull request #321 from sdodson/fix_undefs

undef should never be quoted
Allow vhost plugin to be colocated with broker
Add ensure => running for some node services
Merge pull request #323 from detiber/fixNodeServices

Add ensure => running for some node services
Merge pull request #322 from detiber/fixvhostforaio

Allow vhost plugin to be colocated with broker
Refactor openshift_origin::register_dns to avoid using ensure_resource

We've discovered that puppetlabs-stdlib ensure_resource has a bug[1] that leads to the command parameter being ignored. This
seems to be addressed by upgrading to Puppet 3.3.0 or later, however we don't want to force users to do that.
Additionally, register_dns had a few issues, mostly centered around the fact that we were passing in a 'fqdn'
that really wasn't a FQDN but instead strings like 'register $role dns' which would then call an exec titled
'Register $fqdn'. Hopefully this simplifies things a bit.

1. https://tickets.puppetlabs.com/browse/MODULES-832
Merge pull request #326 from sdodson/refactor_register_dns

Refactor openshift_origin::register_dns to avoid using ensure_resource
Generate self-signed certs if needed

- also some puppet-lint cleanup on touched files
- add apache license to selbooleans.pp
Merge pull request #317 from sdodson/enterprise-2.2-merge

Wherever we reference apache user add httpd package requirement