Katello/katello — pull request #3738 by iNecas (2014-02-25 21:01:36+00:00)
Title: Merge laster master into cv-rework

Resolving the conflicts after dynflow merge