fixed service & envrionment factories + added cmdb to pluggable_apps

A few small changes popped out during assets-synergy merge.

@xor-xor @quamilek