This has been fixed, and the solution merged: https://github.com/jenkinsci/jenkins/pull/4676
@Sam Hrncir terrific. Thank you.