Merge v2.2.x to master

Philip Elson requested to merge pelson/cmmnbuild-dep-manager:merge_v2.2.x_to_master into master Oct 21, 2019