Add the ability to choose master server port + adding an additional master server.
Will be usefull to continue tracking of 4.1 server after FS master shutdown for 4.1