Merge "Add the ability to configure NTP port for tests"