Standardise on 'plumbing'

Be consistent with beta.plumbing, alpha.plumbing etc
Correct trailing ,

Change-Id: I5d5fc1add643875650d01fff3c3288c4e3567071
Merge "Standardise on 'plumbing'"