Merge "bug fix: handle portReconfiguration in testEOS()"