A better fix for the ec2 stuff.

This breaks Instance.get_by_uuid() into two pieces so that while
we're transitioning, we can pass a sqlalchemy entity to it
and avoid the additional database hit of a new lookup.

Change-Id: Ia0c4ced96d7dc55655d8256a067d60bfab896847