Make sure instance_type has extra_specs

Make sure that when scheduling, the instance_type used in filters
contains the 'extra_specs'.  This is a bit ugly, but will get cleaned up
with objects.

Fixes bug 1192331

Change-Id: I3614f3a858840c9561b4e618fc30f3d3ae5ac689
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp