Merge pull request #172 from tmorgner/master

PRD-4638: Watermark elements shall not flag other elements as overlap
Merge pull request #173 from tmorgner/master

PRD-4636: Test and fix for not updating the styles when moving the eleme...
[ENGOPS-99] Fix BIG-DATA revision property to match pentaho pattern.
Preview state incorrectly enabled when template is customized
Merge pull request #174 from gretchiemoran/master

Preview state incorrectly enabled when template is customized