master 4fcfaf0e28be1
Looks like this still needs to be committed/cherry-picked to release/jon3.1.x
release branch ba6cc59d59f6c4
Moving to ON_QA since JON 3.1.1 ER2 build is availble - https://brewweb.devel.redhat.com/buildinfo?buildID=228250
Verified on JON 3.1.1 ER2