fix: updating indexes in a more consistent manner#7575

shawkins wants to merge 2 commits intofabric8io:mainfabric8io/kubernetes-client:mainfrom

shawkins:iss7265shawkins/kubernetes-client:iss7265Copy head branch name to clipboard