Merge "Handle RestTemplate Error handling so NCMP cna report correct server status"