Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev