Add EC2InstanceMapping object for use in EC2

The EC2 code has a table mapping instance UUIDs to EC2 IDs.  This patch
creates the Nova object for this so that we can remove direct use of
these db.api calls from the EC2 code.

Change-Id: Ib55426de29c1290ff9c7bcb999fb3b3124521750
ec2: Convert to use EC2InstanceMapping object

Update the EC2 code to make use of the EC2InstanceMapping object instead
of using the db API directly for managing instance UUID to EC2 ID
mappings.

Change-Id: I66d60a29f0d909edd381e8492a4754bdd0eb8e52
Rename VolumeMapping to EC2VolumeMapping

During the code review for adding the InstanceMapping object, a
request was made by a couple of people to rename it to
EC2InstanceObject.  I did that so now I think we should rename the one
that already merged to also have the EC2 prefix.

Change-Id: I0b0847b6d4e229c973e268045709fa90726baed9
Fix "fixed_ip" parameters in unit tests

In test_create_instance_with_neutronv2_fixed_ip_already_in_use of both
v2 and v3, these tests pass wrong parameters "fixed-ip" instead of
valid parameter "fixed_ip".
The purposes of these tests are to check the behaviors when passing
in-use addresses, but current tests contain two negative factors and
we cannot test the purposes now.

This patch fixes the parameters. This problem was detected through the
API validation works and Ic17d2227909c9180ca86c9d578dad4c73ec57dfc needs
this fixing.

Change-Id: I4d54a1522983c996431b995ed157b32d13c3bc88
Closes-Bug: #1331317
Update websocketproxy to work with websockify 0.6

Websockify version 0.6 bring with it several bugfixes
and new features that affect Nova (including a fix for
novncproxy zombies hanging around and better support
for the python logging framework).  However, it also
broke backwards compatibility due to a refactor which
brought it inline with other Python socket server libraries.

This patch updates the websockify code to function with
websockify version 0.6 as well as websockify version 0.5.x.

Change-Id: I7858dbb49bee8de3fe725beb6793eac3ecba71b6
Merge "Add EC2InstanceMapping object for use in EC2"
Merge "ec2: Convert to use EC2InstanceMapping object"
Merge "Update websocketproxy to work with websockify 0.6"
Merge "Rename VolumeMapping to EC2VolumeMapping"
Merge "Fix "fixed_ip" parameters in unit tests"