AMBARI-5455. Ambari configuration for map join conversion and tez container size seems wrong - additional fixes. (srimanth)

Conflicts:
	ambari-web/app/utils/configs/defaults_providers/hive_defaults_provider.js