Merge "Move includes/auth back to the standard classmap autoloader"