Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/documentTypes/views/permissions/permissions.html

src/Umbraco.Web.UI.Client/src/views/documentTypes/views/permissions/permissions.html

@@ -102,8 +102,6 @@
 
                 <div class="sub-view-column-right">
                     <umb-box-content>
-                        <p ></p>
-
                         <div class="umb-panel-group__details-status-text" ng-if="!model.historyCleanup.globalEnableCleanup">
                             <p class="umb-panel-group__details-status-action"><localize key="contentTypeEditor_historyCleanupGloballyDisabled"></localize></p>
                         </div>