Remove two unused db.api methods

Remove two methods from the db API that are no longer used.  These
methods were deprecated when the VolumeMapping object was created,
which doesn't use them.  The relevant code has been converted to use
the VolumeMapping object, so these can now be removed.

Change-Id: I8c230d994a108c9f4c1ee7e112178b852520cb3e
Add new ec2 instance db API calls

The existing API calls for the EC2 instance ID mappings only returned
the EC2 ID or the UUID, not the full mapping.  We really want APIs
that return the whole mapping for use with a nova object.  This patch
adds those APIs which will be used by the InstanceMapping nova object.

Change-Id: Ie1e5aa1c80c92cc65c6a1e062922f0375b742ea6
Merge "Remove two unused db.api methods"
Merge "Add new ec2 instance db API calls"