Patch Set 4: Unclean IP, do not check in

I created a CQ for this contribution:

https://dev.eclipse.org/ipzilla/show_bug.cgi?id=5004

I will need John and Roland to state some information in bug 336749 regarding the provenance of the contribution for the IP team.