F28 Self Contained Change: Django 2.0