Issue #3060823: Change the Automated Functional Acceptance Testing to work with changes in the 8.x-7.x branch