[1.7.x] Added missing spaces to implicitly joined strings

Backport of 4c39c270af from master