Add rhel to DISTRO match

Match RHEL and CentOS and provide them as a DISTRO prefix of "rhel"

Change-Id: Ida19130ce9499d4d1fd2360fadc6b870b24bbc95
Merge "Add rhel to DISTRO match"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp