* Remove parameters from entity references when constructing a security reference.
* Add a method for removing parameters to EntityReference
* Make sure to keep entity references unmodified when possible

(cherry picked from commit c80c1ff8)