node nyon-geoportail2: include nyon user accounts
Merge branch 'master' of ssh://puppetmaster.infra.internal/srv/puppetmaster/stable/puppetmaster into stable
Merge branch 'master' of ssh://puppetmaster.infra.internal/srv/puppetmaster/stable/puppetmaster into merge-stable-on-staging
Merge branch 'master' of ssh://puppetmaster.infra.internal/srv/puppetmaster/staging/puppetmaster into merge-staging-on-stable
Merge commit '538d2ab1376bc691e9ea07e168d1e37f171f6366' into staging
Add foreman_proxy Ips to allowed addresses in foreman
Merge pull request #124 from mremy/add_param_for_dell_omsa_check

Allow to modify OMSA check parameters
openerp-prod.infra.internal node created, local_tmpl::app::c2c_openerp_internal and srv::c2c_openerp_internal copied from c2c_openerp_physical
openerp-prod.infra.internal node created, local_tmpl::app::c2c_openerp_internal and srv::c2c_openerp_internal copied from c2c_openerp_physical
Merge pull request #545 from mattboston/patch-2

Update alias.pp to let users of Amazon Linux use the module
quote paths for windows compatability
add Match directive
Update README
ssd config removed from wrk13 (no more ssd)
ssd config removed from wrk13 (no more ssd)
Rename proxy to root and secproxy to proxycas
sudoers file: add default secure_path

On Wheezy, secure_path is not set by default anymore (was set to a
hardcoded value in Squeeze). To make running commands without path
working again in Wheezy, we want to set a standard PATH value by
default.
added hiera parameter for qgis installation in c2c::wrk (defaults to true)
adding "trusty" (Ubuntu LTS 14.04) repository
adding "trusty" (Ubuntu LTS 14.04) repository