Merge "DMI Plugin replace WebSecurityConfigurerAdapter"