Several changes for PrimeFaces 4.0 compatibility
Merge remote-tracking branch 'origin/master'