(QENG-1509) merge pe-beaker and beaker post pe 3.7 release

Cherry pick changes on pe-beaker and add to foss beaker.