proper postgres only solution for KKJ2 transfer
Merge branch 'upload-servlet' into dev