Remove the servlet-security-genericheader-auth from the 6.2.x branch since it uses private APIs