Merge pull request #501 from bhariharan/unstable

Adding support for 'communityId' and 'communityUrl' at token endpoint
Fixes for Jenkins failures