Fixes against NullPointerException #579
Merge branch 'trunk' of https://github.com/impetus-opensource/Kundera into trunk
Fixes for #541
Fixes for #564