Merge ISPConfig 3.0.5.3 modifications