Updates to fix build errors due to release of OpenStack Juno.