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/BitstreamServiceImpl.java

@@ -144,8 +144,9 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl<Bitstream> imp
      * @param assetstore corresponds to an assetstore in dspace.cfg
      * @param bitstreamPath the path and filename relative to the assetstore
      * @return  the newly registered bitstream
-     * @throws IOException
-     * @throws SQLException
+     * @throws IOException if IO error
+     * @throws SQLException if database error
+     * @throws AuthorizeException if authorization error
      */
     @Override
     public Bitstream register(Context context,
@@ -255,7 +256,9 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl<Bitstream> imp
         //Remove all bundles from the bitstream object, clearing the connection in 2 ways
         bundles.clear();
 
-        deleteMetadata(context, bitstream);
+
+        // Remove policies
+        authorizeService.removeAllPolicies(context, bitstream);
 
         // Remove bitstream itself
         bitstream.setDeleted(true);