Merge remote-tracking branch 'upstream/master' into DS-3179-jspui-remove-file

Conflicts:
	dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java

dspace-api/src/main/java/org/dspace/content/CommunityServiceImpl.java

@@ -328,6 +328,9 @@ public class CommunityServiceImpl extends DSpaceObjectServiceImpl<Community> imp
 
     /**
      * Internal method to process subcommunities recursively
+     * @param community community
+     * @param collectionList list of collections
+     * @throws SQLException if database error
      */
     protected void addCollectionList(Community community, List<Collection> collectionList) throws SQLException
     {
@@ -489,9 +492,11 @@ public class CommunityServiceImpl extends DSpaceObjectServiceImpl<Community> imp
      * Internal method to remove the community and all its children from the
      * database, and perform any pre/post-cleanup
      *
-     * @throws SQLException
-     * @throws AuthorizeException
-     * @throws IOException
+     * @param context context
+     * @param community community
+     * @throws SQLException if database error
+     * @throws AuthorizeException if authorization error
+     * @throws IOException if IO error
      */
     protected void rawDelete(Context context, Community community) throws SQLException, AuthorizeException, IOException
     {
@@ -528,9 +533,6 @@ public class CommunityServiceImpl extends DSpaceObjectServiceImpl<Community> imp
         // Remove any Handle
         handleService.unbindHandle(context, community);
 
-        deleteMetadata(context, community);
-
-
         Group g = community.getAdministrators();
 
         // Delete community row