Resolves: rhbz#1740751 Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
and cleaned up old patches and obsolete hacks