Merge "(bug 35993) API gettoken parameter is deprecated (release notes complement)"