Fixed build error in EntityListUtil.
Merge conflicts resolved.