Fix/bond naming

Some cleanup as suggested in:

https://github.com/crowbar/barclamp-deployer/pull/147#issuecomment-22380451