CMS-1646: Change to support multiple values in java el breaks compare expressions. Modified RYA's commit.