Couple more updates to wrap potential EDT problems in the table
browser.  Also fixed a test problem that resulted from these changes.
Refs #2965

Change-Id: I579cf4f7014bead1c6a257bfc65cb14125b0c8ac