ISPN-4871 Remove KeyValueFilterFactory and ConverterFactory to prevent
confusion

* Also removed additional imports
Test that replaying a prepare command doesn't acquire the lock twice