The civicrm.config.php does not consider drupals possible configuration of a sites/all/modules/contrib folder

So if I put all my modules in sites/all/modules/contrib and run say
php bin/cli.php -u test -p test -e Job -a execute
I will get this error
Could not load the settings file at: /var/www/dlive/sites/all/modules/contrib/civicrm/../../../default/civicrm.settings.php
But if I alter the civicrm.config.php so that it looks for contrib folder as well it works. This way the user does not have to think about setting up a settings_location.php
I think this is common enough in a drupal install to be an issue.
I attached a potential patch.