Make SavedObjectFinder
backward compatible
#162904
Merged
SavedObjectFinder
backward compatible
#162904