Sync correct charm-helpers branch

Revert accidential commit that made use of an obsolete
feature branch for charm-helpers.

Change-Id: I7e50cfa2e2b836a087d48c93ab146d5532b11793

charm-helpers-hooks.yaml

@@ -1,4 +1,4 @@
-branch: lp:~james-page/charm-helpers/network-spaces-api-endpoints
+branch: lp:charm-helpers
 destination: hooks/charmhelpers
 include:
     - core

hooks/charmhelpers/contrib/openstack/amulet/deployment.py

@@ -126,7 +126,9 @@ class OpenStackAmuletDeployment(AmuletDeployment):
         # Charms which can not use openstack-origin, ie. many subordinates
         no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
                      'openvswitch-odl', 'neutron-api-odl', 'odl-controller',
-                     'cinder-backup']
+                     'cinder-backup', 'nexentaedge-data',
+                     'nexentaedge-iscsi-gw', 'nexentaedge-swift-gw',
+                     'cinder-nexentaedge', 'nexentaedge-mgmt']
 
         if self.openstack:
             for svc in services: