Fixing STRATOS-762
re-organizing puppet modules
Fixing STRATOS-762: Retrieve clusterId from Cartridge subscription
Merge remote-tracking branch 'upstream/master' into master-agent