Release Candidate v1.4.0

Merge branch 'v1.4.0-branch'

* v1.4.0-branch:
  Revert SampleImageAnalysis id attribute to type Integer
  Replace primitive types in API and model classes
  Update expected test data
  Update tests for non-primitive expected values
  Modify capacity attribute to type Integer
  ISPyB model classes fix attribute types

Change-Id: I1aafe8e1b84018bfa28f4f5dfb1debca667a2ca7

Author: phathaway