MODE-2259-3.x Fixed the EAP domain mode deployment issues on the 3.x branch