BISERVER-8504 - Added filter based on the extra roles defined
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8566
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8566
Merge pull request #185 from webdetails/BISERVER-8504

BISERVER-8504 - Added filter based on the extra roles defined
Merge pull request #186 from krivera-pentaho/dev

BISERVER-8101 - Updated DefaultBlockoutManager to handle DateIntervalTrigger and NthIncludedDayTrigger
Fix JUnit Tests
Merge pull request #187 from bytekast/master

Fix JUnit Tests
[BISERVER-8609] - Add fallback mechanism when retrieving localized title/description
[BISERVER-8337] - No longer need to load localizationMap when getChildren is invoked. The client can utilize the REST service instead.
Localizing XAction content and properties.
Merge pull request #188 from e-cuellar/dev

Localizing XAction content and properties.
Merge pull request #189 from bytekast/master

[BISERVER-8609 ][BISERVER-8337]
BISERVER-8101 - Updated QuartzSchedulerTest to set up the scheduler instance appropriately.