Move 'pages' job into build section of the file. Make the list of variants consistent wherever used. Closes #3419069