Merge branch 'topics/mohmun03/rename_conf_with_skip' into 'master'

Renaming CONF with SKIP.

See merge request tooling/qa-tools!11