CLOUDIFY-2416 fixed some bugs and added some more fabric config