Merge "Add ability to specify ShibURLScheme"