Another (small) batch of fixes from the essex-hack-suse branch

The attribute_helper changes are required for features we added to the openstack barclamps (we'll submit separate pull request for those).

The recursive_merge vs. deep_merge fixes a serious race condition for us, that cause nodes to be inaccessible by crowbar  for some period of time (until another regular chef-client run kicked in).