JSP merge fixes for 5.0.4 merge