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]