Fix some imports and added some changes to K8S deployment

[scottfrederick]

@ojhughes I had to fix the imports to get another change in. You should be able to rebase and remove those changes.