Use PrimaryCollege/PrimaryDepartment in AD

College and Department are multi-valued, but AD needs single values, so
I am switching to PrimaryDept/College