Sync w/ Havana 3 milestone.
Drop b3 from release name.

Also, drop patch 0003 (which drops oslo-sphinx).