Changed Collections.emptyList to new ArrayList because openJPA can not
handle Collections.emptyList. 

Again because the merge did not work after files were moved to a new
location.