[CORD-2031] Migration of vHSS service to 4.1

Change-Id: Iaab41b6cbfa8fb5036ae04bb9f30f3a55bcdbd1e
(cherry picked from commit c8c6ddd43f0657c2146ac4a8b5ff03141b6375db)
diff --git a/xos/vhss-onboard.yaml b/xos/vhss-onboard.yaml
index e2ecde4..c43f59c 100644
--- a/xos/vhss-onboard.yaml
+++ b/xos/vhss-onboard.yaml
@@ -17,7 +17,7 @@
 description: Onboard the vHSS service
 
 imports:
-   - custom_types/xos.yaml
+  - custom_types/xos.yaml
 
 topology_template:
   node_templates:
@@ -28,10 +28,10 @@
           # The following will concatenate with base_url automatically, if
           # base_url is non-null.
           xproto: ./
+          tosca_custom_types: tosca/custom_types/vhss.yaml
           synchronizer: synchronizer/manifest
           synchronizer_run: vhss-synchronizer.py
-          tosca_custom_types: tosca/custom_types/vhss.yaml
-          tosca_resource: tosca/resources/vhssservice.py, tosca/resources/vhsstenant.py, tosca/resources/vhssvendor.py
+          tosca_resource: tosca/resources/vhsstenant.py, tosca/resources/vhssservice.py, tosca/resources/vhssvendor.py
           private_key: file:///opt/xos/key_import/mcord_rsa
           public_key: file:///opt/xos/key_import/mcord_rsa.pub