LPS-35417 Fix broken tests
LPS-36006 Turn on jsp trim directive whitespaces by default
LPS-36006 SF