ACCUMULO-1999 Backport changes from 1664 which advertise the Master's random port