Next round of essex-hack-suse forward ports [2/2]

This contains the next chunk of our essex-hack-suse work. As previously
cherry-picked from
https://github.com/SUSE-Cloud/barclamp-crowbar/commits/release/essex-hack-suse/master

Where appropriat I squashed multiple commits together to make the patchset
smaller and cleaner.



 bin/barclamp_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Crowbar-Pull-ID: 137ce7e8cd78cc0ffe2196fc1c693585dff02813

Crowbar-Release: pebbles