[JENKINS-20769 JENKINS-20204] Integrating remoting 2.36

Fixed a bug Jesse found in remoting

(cherry picked from commit 75447b57b655e38fdb48f1e854a4b287071342cf)

Conflicts:
	pom.xml