Merge pull request #3431 from hypothesis/remove-query-property-token

Do not use query property in Token.get_by_{userid,value}