Refactoring for Fix #385
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk