Merge pull request #42 from VictorLowther/pull-req-master-902d456b04f9723fcdadbee1c7540b8a939fc3f1

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

Merged by devtool for VictorLowther
update for overlay templates
Merge pull request #43 from cloudedge/pull-req-master-220037ab275d584c5c5598c413c495f23acc5af1

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

Merged by devtool for VictorLowther
update for overlay templates

fix partials
resolve merge
Merge pull request #45 from cloudedge/pull-req-master-8c8400d1e1f431f7c8261eafa4cca36921778510

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

Merged by devtool for VictorLowther
add barclamp admin role
add test overrides
create useful default templates that are named correctly
test roles preserved correctly in proposal
Merge pull request #47 from cloudedge/pull-req-master-908ab5b669db0b558048961fc2ba210774596259

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

Merged by devtool for cloudedge
Merge pull request #48 from cloudedge/pull-req-master-c6df986f158ec88b14a204d7db18f37688cbc3ea

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

Merged by devtool for cloudsleuth
fix typo
update node.discovery info on test runs
replace raw data with form overlay
Merge pull request #49 from cloudedge/pull-req-master-5c24290fb705881acd4bb488abbee2aaeb37b833

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

Merged by devtool for cloudedge
Merge pull request #50 from cloudedge/pull-req-master-4cf7281eca2d501acdae94e8a48c95d5944c55d7

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

Merged by devtool for VictorLowther
add attrib mapping
Merge pull request #51 from cloudedge/pull-req-master-a035e98056469f35dacd39a8f186f456432e2019

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

Merged by devtool for VictorLowther
add discovery map to attrib, align names