ZCLOUD-147 Import bugfix for bootstrap-single-server incorrect behaviour
ZSRV-11471 Reimport patch that allows using non standard MySQL port