LPS-39749 Add back the shortcut path, for the same reason as we did in S...

...erviceBeanMethodInvocation.equals()