Merge branch 'hotfix/2.1.5_handler_upgrades'
Bump version to 2.2.0
Merge branch 'release/2.2.0'
Fix slimit lexer error
Enable auth on hydro portal
Merge branch 'master' into dev

Conflicts:
	setup.py