Merge JDF-421 into EAP boms