Finishing testing and implementation of OSTD-based queries for STS
This merge request picks up where !2 (merged) left off: finishing the migration of OSTD queries from STS, to use OSTD-based queries (i.e. https://4most-tickets.atlassian.net/browse/OPSYS-161).
Edited by Jake Laas