[PPP-3244] - VersionCheck failed due to bad class name in code.
[PPP-3244] - VersionCheck failed due to bad class name in code.
[IVY CHANGE] - resolving dependency for pentaho-reporting-engine
[BISERVER-11022] - Adding support for forcing db meta in SqlMetadataQueryExec via property

Conflicts:
	assembly/package-res/biserver/pentaho-solutions/system/pentaho-spring-beans.xml
	extensions/src/org/pentaho/platform/plugin/services/connections/metadata/sql/SqlMetadataQueryExec.java
Merge pull request #1386 from rmansoor/5.0

[IVY CHANGE] - resolving dependency for pentaho-reporting-engine
Merge pull request #1387 from brosander/SP-1124

[BISERVER-11022] - Adding support for forcing db meta in SqlMetadataQuer...
[BISERVER-11184] Impossible authorize if the username contains "-" character
Merge pull request #1394 from mdamour1976/5.0

[BISERVER-11184] Impossible authorize if the username contains "-" character
[SP-1228] Backport of BISERVER-11275 - Connection Pooling parameters are ignored/overridden by system defaults (5.0)
	- pooling attributes were being checked in the wrong map
	- added map checking for 2 missing polling connection attributes (maxIdle / minIdle )
[PPP-3244] - VersionCheck failed due to bad class name in code.
Reverting  [PPP-3244] - VersionCheck failed due to bad class name in code.

Reverting  [PPP-3244] - VersionCheck failed due to bad class name in code.
We need to perform analysis of this issue in 5.0 SP before we can commit to including this issue.
[IVY-CHANGES] - Add explicit reporting dependencies to the platform
Merge pull request #1413 from rmansoor/5.0

[IVY-CHANGES] - Add explicit reporting dependencies to the platform
[BISERVER-11205],[PRD-4858] - Doh! If 'visible' is true, then the file should be visible.
Merge pull request #1419 from tmorgner/BISERVER-11205-5.0

[BISERVER-11205],[PRD-4858] - Doh! If 'visible' is true, then the file s...
[BISERVER-11356] - Updating the constructor for super user list service.
Merge pull request #1424 from rmansoor/5.0

[BISERVER-11356] - Updating the constructor for super user list service.
[BISERVER-11205],[PRD-4858] - Boolean logic - create locale entry if at least one of title or description exists
Merge pull request #1429 from tmorgner/BISERVER-11205-5.0

[BISERVER-11205],[PRD-4858] - Boolean logic - create locale entry if at ...
SP-1158 - Backport of BISERVER-11010 - Administrator role does not show on Share tab for existing and new folders

What was done:
1) added field is modifiable to AceAcl DTO
2) changed ui to take care of the field
3) changed WS to ignore non-modifiable role and to add admin role for
display only

Conflicts:
	extensions/src/org/pentaho/platform/web/http/api/resources/FileResource.java
	user-console/source/org/pentaho/mantle/client/solutionbrowser/fileproperties/PermissionsPanel.java