Remove usage of deprecated commons.lang3.ObjectUtils methods