First merge from 4.3.7 branch
Fixed UI for 5.4.3, Fixed Individual access rights added when permission was already via group

Fixed UI to work with 5.4.3.
Fixed permissions to be added only when the user does not have them
already. This also prevents individual user rights to be added when user
gets the permissions via group.
Added 5.4.3 jar
Merged changes from master branch. Modified Javascript to work for different versions.