Fix whitespace errors causing Psych to lose its marbles.
Merge pull request #108 from VictorLowther/pull-req-feature-grizzly-master-ffc3762d231760e1644ae1583d71b1790716c46f

https://github.com/crowbar/barclamp-deployer/pull/108

Merged by devtool for aabes
Fix node rename function to not explode.
Merge pull request #110 from VictorLowther/pull-req-feature-grizzly-master-9a77ef6723b715acfb8d892036d330758f85a940

Make feature/grizzly a little more amenable to being built in the Dell build and test env. [4/11]