Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: 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: Icc4af7d3234e9c24d589a39c754779646ae8c2d9