Fix two logic bugs reported in #822#825

HoustonPutman merged 2 commits into

apache:mainapache/solr-operator:mainfrom

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