Merge branch 'hotfix/2018-2-fileassetmanagertest'

71 jobs for master in 114 minutes and 20 seconds (queued for 4 seconds)