Popular Labels and Labels List macros include labels for unpublished draft pages

Issue Summary

Both the Popular Labels and Labels List macros will include results for unpublished draft pages. This means that labels on deleted pages will show in this macro, even if the label isn't on any active pages.

Steps to Reproduce

1. Create a new space (starting in a clean space makes it easier to populate the "Popular macros" table)
2. On a new page, insert a Popular Labels and a Labels Page macro.
3. In the settings of both macros, restrict the results to the current space key.
4. Save the page.
5. Create another new page, with a template that creates a page with a label (e.g. "Decisions")

Expected Results

The label macros will not show labels that are only on unpublished pages.

Actual Results

The label macros show labels that are on the unpublished draft page. (decisions label in the case of the "Decisions" template)

Workaround

All users that have a labelled drafts for unpublished pages in the space will need to delete their own drafts