fixed service & envrionment factories + added cmdb to pluggable_apps
Merge pull request #1067 from xliiv/small-fixes

fixed service & envrionment factories + added cmdb to pluggable_apps