changes to support new features of simplesaml