Fix two logic bugs reported in #822#825

oyjhl wants to merge 2 commits intoapache:mainapache/solr-operator:mainfrom

oyjhl:mainoyjhl/solr-operator:mainCopy head branch name to clipboard