https://issues.jboss.org/browse/WFCORE-453 Align CLI expression handling with server-side handling