better scoping

git-svn-id: https://primefaces.googlecode.com/svn/primefaces/trunk@12031 5a70e874-a5cb-11dd-8af2-493fb0bb9f7c
Next maintenance iteration for 5.1.x
Merge branch 'master' into 5.1.x