ESDEV-1986 Remove annotation "@return null" if return statement is not present in the method/function.