Changing login to handle both CKAN and Drupal logins
Merge branch 'master' of github.com:datagovuk/ckanext-dgu