Update quantum+cinder branches to master.

Change-Id: Ie812328c37ec50bee2b9e336ac4e3659b0b873a4