Core pr 5

Fixed some user redirects and coding style.
We have added a patch to drupal core in the main makefile, so roles are not translated.

See https://www.drupal.org/files/issues/translate_role_names-2205581-1.patch