Bulk update of choices=BOOLEANS to type='bool'
Merge pull request #6422 from risaacson/migrate_booleans_bool_ec2_vpc

Bulk update of choices=BOOLEANS to type='bool'