Zap nagios binary.
Merge pull request #45 from VictorLowther/pull-req-master-5a61c0feb8bea25dbf1b92b356a5c55f23cd28ba

Merged by devtool for rhafer
Add barclamp configuration data for catalog function
Merge pull request #47 from waynepallen/pull-req-master-0d98bdb0444c68de93b59e8c9eb087a089b6ddaf

Merged by devtool for VictorLowther