How to remove the cid parameter appended to the URL in a JSF application running on EAP 6?

Issue

• Attribute include-view-params from redirect element declared in faces-config.xml is not working. When setting the value to false with double quotes deployment is success but redirect includes parameters in the URL. Setting the value to false without double quotes deployment is with error due to exceptions with faces-config.xml.
• The include-view-params to false will not eliminate cid parameter after login/logout action as seen in the picketlink-idm-sample.