merge flavors on appliance by specs
also merge flavors that come from openstack
get rid of locality
handle flavor activate/deactive
remove unnecessary parameter
merge from master
Merge pull request #123 from StackMonkey/merge_flavors_by_specs

Merge flavors by specs