node.discovery does a merge, not replace
capture data from forms instead of just raw
Merge pull request #664 from cloudedge/pull-req-master-4cf7281eca2d501acdae94e8a48c95d5944c55d7

https://github.com/crowbar/barclamp-crowbar/pull/664

Merged by devtool for VictorLowther