Merge pull request #644 from cloudedge/pull-req-master-220037ab275d584c5c5598c413c495f23acc5af1

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

Merged by devtool for VictorLowther
UI screens to edit node-role data & template
victor wantes to see these in production mode too (for now)
converge transition to use single annealer call and update UI to run it

converge transition to use single annealer call and update UI to run it