MONDRIANn-1850 - changing example value for olap4j driver className to the PentahoSystemDriver
Merge pull request #1134 from kurtwalker/MONDRIAN-1850

MONDRIANn-1850 - changing example value for olap4j driver className to t...
[MONDRIAN-1844] Small fix. The API says that we have to pass null if no roles are effective for a given connection.
Merge branch 'master' of https://github.com/pentaho/pentaho-platform
Merge pull request #1135 from lucboudreau/master

[MONDRIAN-1844]
BISERVER-10759 - Fixing FileRepository.Builder inner class to use getter methods instead of accessing properties directly, in the case of FileRepositoryProxy instances
Merge pull request #1136 from pminutillo/localdev

BISERVER-10759 - Fixing FileRepository.Builder inner class to use getter...
MONDRIAN-1846 - removing the skip of fragment bundles during OSGI load.  This was causing a ClassNotFoundException for Mongo classes and and schema load error only on first boot.  This will cause an error to be printed during startup, but analyzer will work front to back with mongolap.
Merge pull request #1137 from kurtwalker/fragment

MONDRIAN-1846 - removing the skip of fragment bundles during OSGI load. ...
MONDRIAN-1846 - need to resolve fragment bundles and their dependencies before other bundles.  Also, skipping the start for fragment bundles
Merge pull request #1139 from kurtwalker/fragment

MONDRIAN-1846 - need to resolve fragment bundles and their dependencies ...
[MONDRIAN-1846] Making boot code flexible with bundle directories which don't exist.
Moving h2 jar to tomcat/lib
BISERVER-10760 - Write the JMeter script - Covers 5.0 baseline and changes
[biserver-10748] Fix Acls on inherited entries from children/tree service calls when includeAcls is true
[BISERVER-10748] Fix bug on children/tree calls when includeAcls=true while excluding members.
Merge pull request #1133 from tkafalas/feature

[biserver-10748] Fix Acls on inherited entries from children/tree servic...
Merge pull request #1138 from pminutillo/localdev

BISERVER-10296, BISERVER-10760 - Write the JMeter script
[BISERVER-10848] Show icon for .kjb files
Merge pull request #1140 from webdetails/BISERVER-10848

[BISERVER-10848] Show icon for .kjb files