Move db.instance_type_extra_specs_* to db.instance_type_* methods

All instance_type_* methods should be one after another

blueprint db-cleanup

Change-Id: Icc69c45dbcb3dcea5f81266a11f726b5b3215e27
Merge "Move db.instance_type_extra_specs_* to db.instance_type_* methods"