Merge "CadiAuthFilter-junits"