Remove setuid from 12.04 not needed supposedly with Perl5
Merge branch 'master' into release/essex-hack/master
Merge branch 'master' into release/essex-hack/master
Ubuntu 12.04 does not need or require perl-suid.
Merge branch 'master' into release/essex-hack/master

Conflicts:
	chef/cookbooks/nagios/recipes/monitor_hw_client.rb
Merge branch 'master' into release/essex-hack/master
Merge pull request #9 from VictorLowther/f46a678a7312be280573e0b6a44553831eabb495

Pull in latest updates from development into essex-hack. [3/6]
Merge branch 'master' into release/essex-hack/master
Merge pull request #12 from VictorLowther/pull-req-release-essex-hack-master-d7973e0c88

Pull changes from development into essex-hack [6/16]
use the admin-lan ip address of the nagios server
Merge pull request #13 from ehaselwanter/pull-req-feature-use-nagios-admin-ip-address-master-ba6ef6cbdc

nagios admin ip [1/4]
DDE804 - when reseting nodes, network info goooooes away. handle (rescue nil) this
Merge pull request #15 from aabes/pull-req-master-f6bd828642

make libxml-ruby happy during crowbar_join [2/6]
Merge branch 'master' into release/essex-hack/master
Merge pull request #17 from galthaus/pull-req-release-essex-hack-master-f429f42050

Merge dev into essex-hack [6/10]
Merge pull request #18 from galthaus/pull-req-master-f71251732c

Merge essex-hack back into development. [19/26]
Update recipe to use new address helpers.
Update barclamp to use the new network helpers
Merge pull request #20 from VictorLowther/pull-req-feature-ip-hacking-master-0553eafa6b

Rewrite network barclamp to manage interfaces directly. [5/22]
Remove redundant definition for epel