Merge "Remove Http Status 401 for cps core and NCMP(CPS-2126 #3)"