ITS#9311 - Contrib modules to be singular

3 jobs for master in 28 minutes and 8 seconds (queued for 3 seconds)