SatelliteQE/robottelo — pull request #1473 by JacobCallahan (2014-09-30 20:24:59+00:00)
Title: Replacing instances of orm.type.get_value() with fauxfactory methods. 

Also, resolving merge conflicts.