Searching the DEFAULT_ROLES_PATH and the roles basedir should come before this, and it has been a long standing oversight. Fixes #17882