Merge remote-tracking branch 'gerrit/master' into dev/reorg

Conflicts:
	roles/linux/rhel/rdo/templates/rhel.repo.j2

Change-Id: I8dbad3bf7979889a61d2db75aafc91553e149be6