Combined filter and injector for mass storage devices

(cherry picked from commit 77fac3573b66129a6426e5aac7fb849ef945f06e)

Conflicts:
	src/Filters/PacketFilter_MassStorage.cpp
	src/Filters/PacketFilter_MassStorage.h