Merge "Fix msg hostname for mitaka/ocata cookied models"