sample_set.py refactor custom controller queries
removes a fair amount of code duplication in the queries.
GitLab upgrade completed. Current version is 17.11.1. We now benefit from the features of the release 17.11.
removes a fair amount of code duplication in the queries.