Merge "Select addons namespace with kubectl in e2e tests"