Includes a fix for Query unwrapping before passing it to addNamedQuery. Issue: SPR-13960 Issue: SPR-13957