Port fix for some EL parsing in attributes

https://issues.apache.org/bugzilla/show_bug.cgi?id=55735