Various improvements to versioning to help with mcollective packaging