Merge remote-tracking branch 'remotes/alt/trunk' into branch-3.0-perf-unchanged
Conflicts:
ambari-agent/conf/unix/install-helper.sh
ambari-agent/src/main/python/ambari_agent/ActionQueue.py
ambari-agent/src/main/python/ambari_agent/CommandStatusDict.py
ambari-agent/src/main/python/ambari_agent/PythonExecutor.py
ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
ambari-agent/src/main/python/ambari_agent/alerts/port_alert.py
ambari-common/src/main/python/resource_management/libraries/functions/lzo_utils.py
ambari-server/src/main/java/org/apache/ambari/server/HostNotRegisteredException.java
ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
ambari-server/src/main/java/org/apache/ambari/server/events/AmbariEvent.java
ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilter.java
ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariJWTAuthenticationFilter.java
ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertUri.java
ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
ambari-server/src/main/java/org/apache/ambari/server/state/alert/Reporting.java
ambari-server/src/main/java/org/apache/ambari/server/state/alert/ScriptSource.java
ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java
ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py
ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/metadata.py
ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/setup_ranger_atlas.py
ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/status_params.py
ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/hbase.py
ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/params_linux.py
ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/setup_ranger_hbase.py
ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py
ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs.py
ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/install_params.py
ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/setup_ranger_hdfs.py
ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hcat.py
ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive.py
ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive_interactive.py
ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py
ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_windows.py
ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/setup_ranger_hive.py
ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/setup_ranger_hive_interactive.py
ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/status_params.py
ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat.py
ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py
ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox.py
ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_windows.py
ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/setup_ranger_knox.py
ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py
ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie.py
ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py
ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/params.py
ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/params_linux.py
ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py
ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/package/scripts/params_linux.py
ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py
ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/setup_ranger_xml.py
ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py
ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms.py
ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py
ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py
ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/params.py
ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py
ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/status_params.py
ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py
ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop.py
ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/params_linux.py
ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/setup_ranger_storm.py
ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/status_params.py
ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/package/scripts/params_linux.py
ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/package/scripts/tez.py
ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/package/scripts/tez_client.py
ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_windows.py
ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/setup_ranger_yarn.py
ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/status_params.py
ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/yarn.py
ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/properties/krb5_conf.j2
ambari-server/src/main/resources/webapp/WEB-INF/spring-security.xml
ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java
ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilterTest.java
ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py
ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
ambari-web/app/controllers/main/host/details.js
ambari-web/app/templates/application.hbs
ambari-web/app/views/main/host/summary.js
ambari-web/test/controllers/main/host/details_test.js
contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/package/scripts/params_linux.py
