Merge branch 'develop' into 4.0.0
Making sure that the default port for the management API is set to 33333
 #INSTL-84 Done