Rev master to 1.9.x
Merge pull request #712 from candlepin/alikins/rev_master_1.9

Rev master to 1.9.x