Issue [#2241051] Pass contextual argument to hook_controller_settings…

…_alter()

Merge branch '7.x-3.x' of git.drupal.org:project/services into 7.x-3.x