[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
Merge pull request #1432 from kolinus/SP-1158

SP-1158 - Backport of BISERVER-11010 - Administrator role does not show ...
[BISERVER-11362] - Scheduling a PRPT Report to be Emailed as an Excel 2007 Format sends an unopenable Excel Document (5.0)
Merge pull request #1435 from mdamour1976/5.0

[BISERVER-11362] - Scheduling a PRPT Report to be Emailed as an Excel 2007 Format sends an unopenable Excel Document (5.0)
[BISERVER-11402] Scheduler is not sending Excel, RTF, or Text files from PRPT reports
Merge pull request #1445 from mdamour1976/5.0

[BISERVER-11402] Scheduler is not sending Excel, RTF, or Text files from PRPT reports
[BISERVER-11423] 2 files are being created for each schedule execution
Merge pull request #1451 from mdamour1976/5.0

[BISERVER-11423] 2 files are being created for each schedule execution
[BISERVER-11452] Cannot edit a Blockout period
Merge pull request #1454 from mdamour1976/5.0

[BISERVER-11452] Cannot edit a Blockout period