Cfy 54 unify @timestamp and timestamp fields in log/event messages

this looks weird. why did you add the cloudify dependency?

also, there are duplicate dependencies with the openstack and libcloud provider.