Resolves: rhbz#2170066, rhbz#2209685, rhbz#2159635, rhbz#2167517 Signed-off-by: Kamal Heib <kheib@redhat.com>