STS-3646: Update to changes in eclipse-commons.