Conflict resolution
Conflict resolution

https://bugzilla.redhat.com/show_bug.cgi?id=1450109
https://bugzilla.redhat.com/show_bug.cgi?id=1451655

mkanoor/manageiq,romanblanco/manageiq,jameswnl/manageiq,israel-hdez/manageiq,hstastna/manageiq,jvlcek/manageiq,ManageIQ/manageiq,chessbyte/manageiq,hstastna/manageiq,skateman/manageiq,tzumainn/manageiq,branic/manageiq,NickLaMuro/manageiq,pkomanek/manageiq,NickLaMuro/manageiq,syncrou/manageiq,romanblanco/manageiq,billfitzgerald0120/manageiq,billfitzgerald0120/manageiq,mresti/manageiq,skateman/manageiq,lpichler/manageiq,israel-hdez/manageiq,gerikis/manageiq,lpichler/manageiq,josejulio/manageiq,kbrock/manageiq,chessbyte/manageiq,syncrou/manageiq,kbrock/manageiq,skateman/manageiq,durandom/manageiq,andyvesel/manageiq,israel-hdez/manageiq,mzazrivec/manageiq,pkomanek/manageiq,hstastna/manageiq,borod108/manageiq,agrare/manageiq,gmcculloug/manageiq,branic/manageiq,kbrock/manageiq,djberg96/manageiq,gerikis/manageiq,josejulio/manageiq,djberg96/manageiq,andyvesel/manageiq,yaacov/manageiq,romanblanco/manageiq,billfitzgerald0120/manageiq,ailisp/manageiq,andyvesel/manageiq,d-m-u/manageiq,jrafanie/manageiq,mresti/manageiq,aufi/manageiq,jameswnl/manageiq,mresti/manageiq,gerikis/manageiq,durandom/manageiq,romanblanco/manageiq,ailisp/manageiq,juliancheal/manageiq,agrare/manageiq,andyvesel/manageiq,ailisp/manageiq,tinaafitz/manageiq,mresti/manageiq,juliancheal/manageiq,mkanoor/manageiq,tinaafitz/manageiq,jvlcek/manageiq,agrare/manageiq,jntullo/manageiq,kbrock/manageiq,juliancheal/manageiq,tinaafitz/manageiq,jvlcek/manageiq,ManageIQ/manageiq,gmcculloug/manageiq,chessbyte/manageiq,yaacov/manageiq,tinaafitz/manageiq,lpichler/manageiq,juliancheal/manageiq,jameswnl/manageiq,yaacov/manageiq,borod108/manageiq,pkomanek/manageiq,lpichler/manageiq,d-m-u/manageiq,mzazrivec/manageiq,ManageIQ/manageiq,durandom/manageiq,jntullo/manageiq,branic/manageiq,ManageIQ/manageiq,jvlcek/manageiq,borod108/manageiq,yaacov/manageiq,jntullo/manageiq,mzazrivec/manageiq,d-m-u/manageiq,gerikis/manageiq,borod108/manageiq,skateman/manageiq,aufi/manageiq,ailisp/manageiq,tzumainn/manageiq,pkomanek/manageiq,jameswnl/manageiq,jrafanie/manageiq,josejulio/manageiq,jntullo/manageiq,mkanoor/manageiq,jrafanie/manageiq,chessbyte/manageiq,tzumainn/manageiq,gmcculloug/manageiq,josejulio/manageiq,israel-hdez/manageiq,billfitzgerald0120/manageiq,mzazrivec/manageiq,hstastna/manageiq,branic/manageiq,djberg96/manageiq,NickLaMuro/manageiq,aufi/manageiq,jrafanie/manageiq,djberg96/manageiq,syncrou/manageiq,tzumainn/manageiq,gmcculloug/manageiq,NickLaMuro/manageiq,durandom/manageiq,agrare/manageiq,d-m-u/manageiq,mkanoor/manageiq,syncrou/manageiq,aufi/manageiq