Merge branch 'hf3.4.18' into 'develop'

Removed unnecessary columns that don't exist in all db versions.

See merge request !3846
Status Job ID Name Coverage
  Unit
passed #6407
phpunit

00:00:42

 
  Acceptance
passed #6408
juice
codeception

00:04:20