Fixes for DSC-323
Merge branch 'master' into nn-dsc-337
Merge branch 'master' into nn-dsc-337

Conflicts:
	src/banjo/upload/step/CreateDerivativeForImageStep.java
Merge branch 'master' into nn-dsc-337
Merge pull request #544 from nla/nn-dsc-337

Fixes for DSC-323