1.2.0 prep
Merge pull request #430 from mhaskel/1.2.0-prep

1.2.0 prep
Merge remote-tracking branch 'upstream/1.2.x' into test
Merge pull request #432 from mhaskel/test

Merge 1.2.x into master
MODULES-1469 MODULES-1470 Support alias (eth0:0), negation for iniface, outiface
Merge pull request #435 from mhaskel/squash_433

MODULES-1469 MODULES-1470 Support alias (eth0:0), negation for iniface, ...
MODULES-1309 - Make package and service names configurable

This was motivated by a need to make this work on Debian Jessie.
Merge commit 'f9a2db99ae5db4068b70cc71dbb568c0c0516532' into
hsmaster_config_service

Conflicts:
	manifests/linux/redhat.pp
Merge pull request #4 from hubspotdevops/hsmaster_config_service

Hsmaster config service