PWEB-4742 - Add build variant support for build and clean targets, plus some general cleanup