Merging kubernetes integration with User Management changes