Update rdo repo
Update init.sls
Update init.sls
Merge branch 'master' into testing

Conflicts:
	etc/yum.repos.d/rdo-release.repo
	init.sls

update RPM-GPG-KEY-RDO-Icehouse
merge testing-master