Merge branch 'workaround_mockito' into 'ibm-trunk'

Removed unused constructor and fixed intermittent unit test failure

See merge request !60