Fixes for Issue#310 - Modified ProxyMap to separate many map related
methods from proxy collection
Merge branch 'trunk' of git@github.com:impetus-opensource/Kundera.git into trunk