Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

84733: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78807: ACE-2083	 - Only allow document encryption if the capability has been licensed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java

@@ -65,6 +65,8 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
     @SuppressWarnings("unused")
     private Object heartBeat;
     
+    private boolean isBootstrapped;
+    
     /**
      * The version of the software
      */
@@ -245,6 +247,7 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
             }
         };
         AuthenticationUtil.runAs(bootstrapWork, AuthenticationUtil.getSystemUserName());
+        isBootstrapped = true;
         // Broadcast that the descriptor service is now available
         ((ApplicationContext) event.getSource()).publishEvent(new DescriptorServiceAvailableEvent(this));
     }
@@ -763,4 +766,10 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
             }
         }
     }
+
+	@Override
+	public boolean isBootstrapped() {
+		
+		return isBootstrapped;
+	}
 }