Half completes: U4-2462 Does the app_plugins manager monitor file changes?
Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5