[BACKLOG-133] Tree rest call file filtering does not work properly
[BACKLOG-197] - Document Rest Endpoints for User Roles. Refactored SystemResourceUtil to be named SystemResourceService and moved the class to the service folder. This change is to match the naming conventions of the other classes.
Merge pull request #1787 from brendan-lynch/oemdoc-dev

[BACKLOG-197] - Document Rest Endpoints for User Roles. Refactored Syste...
[BACKLOG-35] -- Removed jMeter annotation and ivy dependency
Merge pull request #1788 from krivera-pentaho/oemdoc-dev

[BACKLOG-35] -- Removed jMeter annotation and ivy dependency
[BACKLOG-400] only allow get and set of white listed session variables
Merge pull request #1789 from scottyaslan/oemdocDevBranch

[BACKLOG-400] only allow get and set of white listed session variables
[BACKLOG-194]
 - Reverted RepositoryFieAdapter due to static methods and its usages. Updated unit tests.
 - Fixed project compile due to removed jmeter dependency from ivy. RepositoryResource, UserRoleListResource and UserSettingsResource still had it.
 - Fixed tests due to removed java 7 exception on FileService. Test wasn't updated
Merge pull request #1791 from webdetails/oemdoc

[BACKLOG-194]
[BACKLOG-35] -- reverting changes necessary for pentaho-jmeter
Merge pull request #1709 from krivera-pentaho/master

[BACKLOG-35] -- reverting changes necessary for pentaho-jmeter
[BACKLOG-145] - increasing tomcat version to download from 6.0.39 to 6.0.41.
[BACKLOG-26] Add "Data Source" under the New button on the PUC home page
Merge pull request #1710 from kurtwalker/BACKLOG-145

[BACKLOG-145] - increasing tomcat version to download from 6.0.39 to 6.0...
[BISERVER-10547] - Folder is created in user console for non-pentaho LDAP/MSAD users who attempt to login even though authentication fails

remove config xml changes
Merge pull request #1701 from AlexanderBuloichik/BACKLOG-26

[BACKLOG-26] Add "Data Source" under the New button on the PUC home page
Merge pull request #1742 from aliakseihaidukou/BISERVER-10547

[BISERVER-10547] - Folder is created in user console for non-pentaho LDA...
[BISERVER-11908] Unable to load transformation when using PRD with KTR as datasource
Merge pull request #1758 from mdamour1976/master

[BISERVER-11908] Unable to load transformation when using PRD with KTR as datasource
Merge pull request #1696 from tkafalas/feature

[BACKLOG-133] Tree rest call file filtering does not work properly