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

[BISERVER-8337] Move title/description localization logic from RepostoryFileAdapter to JcrRepositoryFileUtils
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8566
BISERVER-8101 - Updated DefaultBlockoutManager to handle DateIntervalTrigger and NthIncludedDayTrigger
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