CB-3358: Remove one more reference to commons-codec
CB-3523: Fix NPE on app restart with outstanding callback