The paste.ini has been rebased on upstream master and a conditional
was added to the nova.conf file.
This change makes it possible for a deployer to consume the
deprecated apis for EC2 and NovaV3. While The endpoints will not be
"automatically" created the paste config has been rebased to support
the apis if needed.
Partially implements: blueprint master-kilofication
Change-Id: I061d743b569ebc0753a47d183545ed185bad854e
cf68c09363