Fix issue #6968 again and revert fix from before
Set version to 5.0.2-ivy2
Merge branch '5.0.x' of https://github.com/ivyTeam/primefaces.git into 5.0.x