Fixes: U4-2627 Ensure that the plugins cache files are named with the machine name
Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4