Add SimpleBackOff to avoid LockTimeout-s.
Fix timeouts in CmdCallbackTest.java.
Scaling factor never falls below default.
Merge pull request #1593 from bpindelski/rebased/develop/callback-scaling

Update CmdCallbackTest to use the scaling factor (rebased onto develop)