HCOLL-167 Created a stateless map - added read and write client tests
Merge remote-tracking branch 'origin/master'