[biserver-8382] workaround deadlocks with CompiledPermissions clearCache and canRead
BISERVER-8498 - PUC Toolbar buttons in wrong order in Firefox Browser
Merge pull request #227 from jeffreythomas/dev

BISERVER-8498 - PUC Toolbar buttons in wrong order in Firefox Browser
BISERVER-8578 - ability to remove blockout times
[PDI-9270]  After reverting a file, the associated JCR locale node ends up having a multi-value property.  This was causing errors.
BISERVER-8498 - PUC Toolbar buttons in wrong order in Firefox Browser
[BISERVER-8654] Fixing extra call to PluginResourceLoader which made caching of plugin resources wholey ineffective.
Merge pull request #228 from kurtwalker/master

BISERVER-8578 - ability to remove blockout times
Merge pull request #230 from jeffreythomas/dev

BISERVER-8498 - PUC Toolbar buttons in wrong order in Firefox Browser
Merge pull request #229 from mkambol/master

Avoid attempts to read a single value from a multi-value JCR property.
Merge pull request #231 from pentaho-nbaker/master

[BISERVER-8654] Fixing extra call to PluginResourceLoader before even checking the cache.
BISERVER-8297 Edit box of schedule name is not shown
Update PentahoHttpSessionListener.java

[BISERVER-7790] - PentahoHttpSessionListener sessionMap is not a ThreadSafe collection
BISERVER-8103: Set accept header properly for /blockout/add
BISERVER-8130 Add REST for resetting email settings
BISERVER-6075 - PUC: About license link should point to our site not GNU.org
Merge pull request #233 from jeffreythomas/dev

BISERVER-6075 - PUC: About license link should point to our site not GNU...
Merge pull request #232 from pentaho-skarmali/biserver-8103_blockout_ui

BISERVER-8103: Set accept header properly for /blockout/add
BISERVER-8656 Security Panel ABS permissions pane not populating
checkboxes consistently.
Merge pull request #234 from tkafalas/master

BISERVER-8656 Security Panel Fix