Fixing django-pipeline issues for master