Merge pull request #687 from cloudedge/pull-req-master-de578b20048cc7b48ec2024b277cbaf74444b4ad

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

Merged by devtool for VictorLowther
localization and improved error message
add retry on fail button
add make_admin button (and fix bug)