Resolves: bz#1458215 bz#1661258 bz#1669020 bz#1683893 Signed-off-by: Milind Changire <mchangir@redhat.com>