version migration fails if version is an integer

The migration 043 fails to account for the case where the version
was specified as a string or version contains non-ascii characters.
This breaks migration for folks that have those incorrect templatesx
 in their database.

Change-Id: I9c2143c9d7a4d61ff41d32ee0f7b12a5640eec72
Closes-bug: 1299174
Properly delete OS::Nova::FloatingIPAssociation

Currently when deleting a Nova FloatingIPAssociation, Heat sends
Nova the floating IP's Id, but Nova expects the actual IP address for
the removal. This leads to invalid database queries on Nova's side, so
this change makes sure that novaclient gets the IP address instead of the Id.

Change-Id: I15dbaf19d9467f5c65dddde77d4115b59e036b0f
Closes-bug: #1299827
Merge "Properly delete OS::Nova::FloatingIPAssociation"
Merge "version migration fails if version is an integer"