Build system fixes to handle new Ert version
p4#: 20319