check-in of 2010 code minus auth_active_directory