CLOUDIFY-1896 Resolve circular Spring reference
CLOUDIFY-1896 Added more logging