Cleanup code#17142

jzheaux merged 2 commits intospring-projects:mainspring-projects/spring-security:mainfrom

ngocnhan-tran1996:cleanupngocnhan-tran1996/spring-security:cleanupCopy head branch name to clipboard