Signed-off-by: Diego Herrera dherrera@redhat.com
rebased onto 25d3f58d7a86de0b9b41a755c748ee09c8279288
rebased onto 5141624ed5ac795f9740dab2c5c49d22f13ab9cf
Pull-Request has been merged by zlopez
Signed-off-by: Diego Herrera dherrera@redhat.com