Update to use ocata clients

Misc updates to switch build to use Ocata release client.

Change-Id: Id06dbb093b74fb0525e6bf763457bada88422890

snapcraft.yaml

@@ -1,5 +1,5 @@
 name: openstackclients
-version: newton
+version: ocata
 summary: OpenStack Client tools
 description: |
   OpenStackClient (aka OSC) is a command-line client for OpenStack
@@ -92,10 +92,6 @@ apps:
      command: bin/murano
      aliases:
        - murano
-  sahara:
-     command: bin/sahara
-     aliases:
-       - sahara
   senlin:
      command: bin/senlin
      aliases:
@@ -153,7 +149,7 @@ parts:
       - python-zaqarclient
       - python-neutronclient
       - python-openstackclient
-    constraints: https://raw.githubusercontent.com/openstack/requirements/stable/newton/upper-constraints.txt
+    constraints: https://raw.githubusercontent.com/openstack/requirements/stable/ocata/upper-constraints.txt
     build-packages:
       - libffi-dev
       - libssl-dev