Fix build problems due to recent ConnId AD bundle upgrade; upgrading some other deps as well