GG-9241 - Fix for Concurrent Modification Exception in partition demand message.
Merge branch 'sprint-29' of github.com:ggprivate/ggprivate into gg-9241
GG-9241 - After merge.
Merge branches 'gg-9241' and 'sprint-29' of github.com:ggprivate/ggprivate into gg-9241
Merge branch 'sprint-29' of github.com:ggprivate/ggprivate into gg-9241
GG-9241 - Addressed code review comments
Merge branches 'gg-9241' and 'sprint-29' of github.com:ggprivate/ggprivate into gg-9241
Merge remote-tracking branch 'origin/gg-9241' into gg-9241
GG-9241
sp-29 fixed NPE
sprint-29 - query test fix
GG-9241 - merge GG-9241 to sprint-29
Minor fix.