Resubmit 1.2 changes per https://dev.eclipse.org/ipzilla/show_bug.cgi?id=3460#c12.
5 files changed