Updates to reflect latest changes

As changes are noted at https://github.com/Jasig/cas/pull/251