Solve branch in migration path

Bug #1153578

Also, change a comment line in another migration where the 'revises' line
was incosistent with the id of the actual down_revision

Change-Id: I8effd70ba553330f9023605a2bfa92bd3d73bd4e
Merge "Solve branch in migration path"
Update oslo rpc libraries

Update oslo rpc libraries to capture changes, primarly motivated
by secret=True flag on password config options.

Added bin/quantum-rpc-zmq-receiver

Change-Id: I40d3ef1a85901e5b9eab803cc67cdad3cbb0719a
Imported Translations from Transifex

Change-Id: Ibd8c4ae41892acf2dba87869ac0ab28f4515ba60
Updates latest OSLO changes

Change-Id: Ief4a24a620b798bf8ece393e90c292c8121ae280
Merge "Update oslo rpc libraries"
Merge "Updates latest OSLO changes"
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into n1k-plugin