Merge branch 'bs-dsc-333-constraint'
Fixes for DSC-323
Merge branch 'master' into nn-dsc-337
empty fields fix
Merge branch 'master' of github.com:nla/banjo
DSC-459 & 440 are fixed. Job type drop-down is fixed. devices & software null arrary are fixed.
changes to extract select values properly
merged with master
minor formatting
Merge branch 'master' into nn-dsc-337

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

Fixes for DSC-323
defect fix as per dsc-432 and dsc-433
Merge remote-tracking branch 'origin/master' into dsc-432
minor update.
Merge pull request #549 from nla/bulkEdit-dsc-379

Bulk edit dsc 379
added staging of image file for reimaging.
Merge branch 'master' of github.com:nla/banjo into bs-dsc-459-440
added cleanup for reimaging.