Use less stupid code to perform suites overrides. Thanks @Blasz

Refs #269.

(cherry picked from commit 0a14d68cf20b57da25590b674993fbb815b66be9)
Merge branch '2.1' into 2.1-geezer