Adds empty table message, multi-table CBV, improved testing facilities. Fixes bug 905376. Fixes bug 905399. Change-Id: Ib93a5b9d09c9b98b0a6365f7d468efb05e28e676