Merge remote-tracking branch 'origin/trunk' into ambari-rest-api-explorer