The way we were testing if $services had a particular word in it is not very
good. If we search for the word 'tor' we will find it when the variable contains
"monitor".

This commit makes the regular expression more specific based on the word
boundaries.

Change-Id: I4dcd80db7322cabc3f71b77fabf7eacd83b4d572
Merge branch 'bug/2876' of /home/git/repositories/micah/leap_platform into develop
disable dhclient from modifying the /etc/resolv.conf file on openstack/amazon instances

The dhclient in these environments is quite aggressive and overwrites the
nameservers we've deliberately chosen to use with google's nameservers. This
commit attempts to fix that.

The dhclient methodology for altering these things is particularly
unpleasant. We effectively redefine the functions that mess with this file to be
noops in the /etc/dhcp/dhclient-enter-hooks.d directory and then we are forced
to restart dhclient by shipping a script that tries to determine the correct PID
and arguments that it was running as before killing and restarting it with the
same arguments.

See debian bugs #681698, #712796 for further discussion about how to make this
less difficult

Change-Id: I51cf40cf98eaddcefd8180e157b6e3ca824173f0
Merge branch 'feature/2842' of /home/git/repositories/micah/leap_platform into develop
Merge branch 'develop' into leap