Merge branch 'stable'
Make QueryParameters.getContainerMap() public. Add Tokeninfo.getAccessTokenWithType()
Merge branch 'issue-28' into stable