AMBARI-6267 Add Services fails with a server error under some conditions.(atkach)