Merge changes from topic "inc-dis" into sc-dev

* changes:
  Disable incremental hardening on own resources
  StringBlock incremental hardening default values