Merge remote-tracking branch 'upstream/develop' into PLFM-2992
Cannot rely on just creator anymore
Do total count correctly for limit and offset in query
Don't use java 7 exceptions yet
message key should take isModification into account
Merge pull request #1542 from marcel-blonk/PLFM-3031

message key should take isModification into account
use ConflictingUpdateException
Merge pull request #1535 from marcel-blonk/PLFM-3019

Don't use java 7 exceptions yet
add folder structure for external sftp upload
Merge remote-tracking branch 'upstream/develop' into PLFM-3019

Conflicts:
	services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/file/FileHandleManagerImpl.java
Merge pull request #1544 from marcel-blonk/PLFM-3019

add folder structure for external sftp upload
Merge remote-tracking branch 'upstream/develop' into PLFM-2992
PLFM-2682
test fix
Merge pull request #1545 from marcel-blonk/PLFM-2992

Do total count correctly for limit and offset in query
fixed test broken by PLFM-3027
Merge pull request #1546 from brucehoff/develop

fixed test broken by PLFM-3027
Merge branch 'develop' into PLFM-2682
PLFM-2682