Merge changes from topic "fix_checkpatch_merges" into integration

* changes:
  fix(plat/st): remove double space
  fix(checkpatch): do not check merge commits