Merge pull request #207 from rmansoor/master

BISERVER-8428 - Updated some UI related items
Don't display conflict dialog if there is a error in REST call
Merge pull request #208 from pentaho-skarmali/biserver-8103_ui_for_blockout_periods

BISERVER-8103
BISERVER-8585 - Update label for inherit permissions