RF-13514: fix handling of servlet 2.5