CLC-3983 Use translated building name, and put room first
CLC-3983 Fix failing testext test
Merge pull request #2714 from ctweney/clc-3983-followup

CLC-3983 Followup - location text improvement