Merge branch '5.2' into 5.x

* 5.2:
  Removed the "roles" variable
  role_names instead of roles

Author: javiereguiluz

security/expressions.rst

@@ -38,9 +38,9 @@ Inside the expression, you have access to a number of variables:
 
 ``user``
     The user object (or the string ``anon`` if you're not authenticated).
-``roles``
-    The array of roles the user has. This array includes any roles granted
-    indirectly via the :ref:`role hierarchy <security-role-hierarchy>` but it
+``role_names``
+    An array with the string representation of the roles the user has. This array
+    includes any roles granted indirectly via the :ref:`role hierarchy <security-role-hierarchy>` but it
     does not include the ``IS_AUTHENTICATED_*`` attributes (see the functions below).
 ``object``
     The object (if any) that's passed as the second argument to ``isGranted()``.