Patch Set 3: Looks good to me, but someone else must approve; IP review completed

I am happy with this change. 

Chris did grant the PMC approval hence setting IP flag to +1.

I agree to Sasa that we should add the NON-NLS comments in a separate change since it's a lot of work to review this change again. Even worse would be the need for another rebase which is getting more and more likely the bigger this change grows.