Merge changes I2e5515ef,I3b807e3e

* changes:
  Add new error codes for rate-limit and max-use failures.
  Update comments on now-unsed user ID and app ID tags.