Project: datamanagement
Issue DM-4401: W16 Qserv Refactoring #2
Additional refactoring of Qserv as found necessary in W16
Story points: 70