Remove whitespace.
Use the check from subdirs_drush_load() directly so we can remove legacy code safely.
Move the fix from Issue #2213387 to the correct files.
Remove deprecated subdirs code.