Bugfix for openid configuration locations, pointed out by Jelle in https://trello.com/c/AwZwAx4l/2289-lib-galaxy-config-py-missing-comma-on-openid-configuration-locations
Merge.
Organize and deduplicate imports, pep8 in lib/galaxy/config.py