Merge "Replace deprecated WebSecurityConfigurerAdapter"