AMBARI-3184. NameNode HA wizard (rollback): When task fails in rollback popup, rollback button is shown
Merge remote-tracking branch 'origin/trunk' into trunk
AMBARI-2607: Ambari manage properties should be relative to a configuration site. (jaimin)