Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  fixup!: Fix omitted documentation
  fixup!: Fix omitted import plugins and libraries
  Display Used Permits in addition to permits available
  Add readable text to the limit type

Change-Id: I6d6468845091ce34fdcfaf920611403340fcd682