MDL-19350 upgrade blocks - tiding up minor bits in repo plugins