merged -r686665 (MRM-905: replace EL exepressions containing "empty(" with "empty (", and "not(" with "not (" as EL expression requires) from trunk