fix tests broken by show-locations hack
this is the wrong approach anyway, but this makes the tests pass for now.
Merge branch 'show-locations' into truckee
better approach to show-locations; works pre-connection now
Merge branch 'show-locations' into truckee
fix tests broken by space-available
Merge branch 'ticket648' into truckee