add discovery map to attrib, align names
Merge pull request #52 from cloudedge/pull-req-master-1e1d51f3a00255be609e66e7e29427b97c63f986

https://github.com/crowbar/barclamp-test/pull/52

Merged by devtool for VictorLowther