Ensure that failure status is set upon exception

Upgrade ZK client to match server version

Sprint 127:

Cosmetic

Try and prevent Storage lock false positive

fix whitespace

Increase session timeout

Merge pull request #64 from CDLUC3/bp5

Bp5 - stubbing merritt-bom.version to use parent property

Sprint 126:

cosmetic