Remy Maucherat
committed
on 21 Feb 17
BZ1423453: Port code cleanup from Tomcat.