Update PUPPETVERSION to 3.1.0
Merge branch '3.1.x'
Incorporate Red Hat's NetworkManager fix into upstream

Red Hat/Fedora have been carrying a patch to restart puppet if
resolv.conf or other networking configuration settings are updated via
Network Manager.  We should be doing this as well, as it's a good idea.

The patch and problem are described in the following bugs:
https://projects.puppetlabs.com/issues/2776
https://bugzilla.redhat.com/532085

Note this only applies to rpms, and only to builds for EL/Fedora. This
patch/fix won't be applied/installed on any debian varient, sles, mac
etc.

Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
Fixup to NetworkManager dispatcher to be compatible with systemd

The previous patch from Red Hat was only compatible with sysV init
systems. This patch modifies the script to enable systemd calls when
appropriate.

Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
Merge branch 'stahnma-add_in_NM_script'

* stahnma-add_in_NM_script:
  Fixup to NetworkManager dispatcher to be compatible with systemd
  Incorporate Red Hat's NetworkManager fix into upstream

closes #1356