Fix cleanup of RDPEI server-side channel
Merge pull request #2268 from hardening/rdpei_cleanup_fix

Fix cleanup of RDPEI server-side channel
Merge branch 'master' into vdibox