AMBARI-7470 js error during install wizard > customize services. (Max Shepel via ababiichuk)
Merge remote-tracking branch 'origin/trunk' into trunk