Fixes for communities refresh scenario
Merge pull request #601 from bhariharan/unstable

Fixes for communities refresh scenario