Using new ConnId AD connector 1.1.5
Merge branch '1_1_X' into 1_2_X

Conflicts:
	pom.xml
Merge branch '1_2_X'