Polishing
Polish mockito usage

Consistent use of BDDMockito rather than standard Mockito.
Update references to SpringSource in the reference documentation