Bring up to date for mcollective 2.2.x