Merge Main branch back to develop after release#20

pengzhouml merged 2 commits intodevelopmarklogic/marklogic-operator-kubernetes:developfrom

mainmarklogic/marklogic-operator-kubernetes:mainCopy head branch name to clipboard