Please back port REPO-1695 / REPO-1696
REPO-1695 NPE in ServicingSearchIndex#updateNodes
REPO-1696 [Back port to 11.2] NPE in ServicingSearchIndex#updateNodes