Change brand attribute from 'os' to 'brand_type'
Merge pull request #375 from candlepin/alikins/flex_os_to_brand_type

Change brand attribute from 'os' to 'brand_type'