Device & Service catalog changes:
    * Service Registrator cmd
    * Device Catalog registration in Service Catalog
    * Small fixes