Merge pull request #1193 from jbeda/fix-e2e

Fix up some flaky behavior of the new improved update e2e test.
Fix label query in e2e basic.sh