Merge remote-tracking branch 'origin/master' into paas

Change-Id: I2190a724fafbbbd7a3e0a5a9f2657c733fa90fd9
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
diff --git a/requirements-dev.in b/requirements-dev.in
index dc09a5e..ee8b383 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-git+https://osm.etsi.org/gerrit/osm/IM.git@master#egg=osm-im
--r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
+git+https://osm.etsi.org/gerrit/osm/IM.git@paas#egg=osm-im
+-r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
 
-git+https://osm.etsi.org/gerrit/osm/osmclient.git@master#egg=osm-osmclient
--r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master
+git+https://osm.etsi.org/gerrit/osm/osmclient.git@paas#egg=osm-osmclient
+-r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas