changes in support of spring security upgrade