Updated openstack/openstack
Project: openstack-dev/devstack  5710853b62fbdfa0c59dba14001620331be9a2bf
null
Use sahara.conf.sample instead of old one

Sahara internals was updated, now we can use correct conf sample.

Change-Id: Ia8d99c2742785c3b5c724617a5dfc2880624a03f
Updated openstack/openstack
Project: openstack/nova  85e1b2b674ec6af0f64478762f48fa85455cbbc7
null
Make compute use quota object existing function

There are several places which check the admin project_id and
user_id with instance project_id and user_id in compute.
There is already a helper function in quota objects, make the code
use the existing one.

Change-Id: I73e7e53ad15eda3788607a1be09c27215d09bda1