Consider sites/sites.php during site-install. --sites-subdir option is now not needed and should be removed for any site that uses sites.php.