Changes associated with bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=445729

As per comment https://bugs.eclipse.org/bugs/show_bug.cgi?id=445729#c3
these changes were originally submitted by J Langley via gerrit

https://git.eclipse.org/r/#/c/34754/

Small changes needed to be made to the original submission, and he and I
apparently did not do the right thing to make those changes via gerrit.
So I applied these changes to master directly.

Change-Id: I286fe2325ee9fd724067b4281882eb39fffdd440