Maintain tokens after role assignments (bug 1170186)

Conflicts:
	tests/test_content_types.py

Change-Id: Iacd2d9e09be4ab3d6a3c5acf4074e4af7e300602
(cherry picked from commit 132ff6d85e02acdce7483c2848686676cb4f14a0)