RF-13781: Source changes required to build richfaces with jdk6