GTNPORTAL-3248 Portlet archive containing gatein-resources.xml fails to redeploy

This PR include changes from this https://github.com/gatein/gatein-portal/pull/635
and add some small fix to 
- not clear config for SHARED/merged resource
- clear JS cached in ResourceRequestHandler