Email Notifications should send short URL

We are currently using Server v7.2.1

I have only just realised that the automatic system Watch alert Notification emails are sent using the full "browser URL", and not the short permanent page URL.

Consequently if the page is renamed or moved after the email Notification is sent, the link is broken!!

The system should send the short permanent Tiny URL as per the <<Page Information>>.

As a (redacted) example, the link that the system sends out in the emails is 

https://xxxxxxxxxxxxxxxxxxxxnts?src=mail&src.mail.product=confluence-server&src.mail.timestamp=15893xxxxxx0061&src.mail.notification=com.atlassxxxxxxx.plugins.confluence-notifications-batch-plugin%3Abatching-notification&src.mail.recipient=5c6979a3xxxxxx1518c6578960005&src.mail.action=view

the Page Information Tiny link is 

https://xxxxxxxxxxxxxxx.xxxx/x/Koqm