Bug 1060835 - Fix storage.properties strings and add separate strings for web menu and panel items, r=paul
Bug 1060839 - Use template strings for multi-line SQL statements in tests. r=ttaubert
Merge f-t to m-c, a=merge