Fixes for #625
Fixes for excluded unlist check in persistence xml loader