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