bugfixes concerning not null constraints in BDDL for enums and unrollable lists
merging
merge cleanup