Merge "Add hints to comment of ApiBase::needsToken/getTokenSalt"