ZSRV-11471 Reimport patch that allows using non standard MySQL port