Revert "Pre-Merge from feature-cloudservice-cg-master due OM porting."

This reverts commit 032b57974500cd716e891139e7c0d074852c9f87.
Fixed dependencies in Package.pm.