Made some changes to support Folsom release of OpenStack.