Fix problem with epel being broken.

Conflicts:
	files/repos/hdp.repo
Fix from Steve L. for number of hdfs threads.
make Ambari IPs consistent with other profiles
Merge branch 'master' into champlain