PPP-3312 - Identical role and user name breaks when reports/folders are assigned either one of them
[TEST] - fix ignored tests, checkstyle, refactoring
BISERVER-12041 REGRESSION: Order of Users and Roles shown in "Select User or Role" window in PUC are re-ordered non-alphabetically - JDBC Auth and LDAP

search sorting was fixed
Merge pull request #2052 from AliaksandrDrebenchuk/BISERVER-12041

BISERVER-12041 REGRESSION: Order of Users and Roles shown in "Select User or Role" window in PUC are re-ordered non-alphabetically - JDBC Auth and LDAP
Merge pull request #2049 from Aliaksandr-Kastenka/PPP-3312

PPP-3312 - Identical role and user name breaks when reports/folders are ...
[TEST] recover ignored tests and add new unit tests
Merge pull request #2086 from annapopova1/JUNIT-MDX

[TEST] recover ignored tests and add new unit tests
[TEST] -- bringing file resource test back to live

What was done:
1) reworked the test so it is executable now
Merge pull request #2088 from kolinus/FRT

[TEST] -- bringing file resource test back to live
Merge pull request #2089 from aliakseihaidukou/repo-test-final

[TEST] - fix ignored tests, checkstyle, refactoring
Merge branch 'master' of https://github.com/pentaho/pentaho-platform
[TEST] - fix RulesTest