Merge "patchwork: update for django 1.11 and fix versions for ldap"