Django 1.7 adaptations part 2

Change-Id: Ia536b6ffd4929d4a1792309861967036b6e3fbc6