HSEARCH-1455 Replacing some @deprecated javadoc tags with TODO resp a plain javadoc comment.