common: merge stable-2.1 to master#26

janekmi merged 10 commits intomasterdaos-stack/pmdk:masterfrom

2.1-to-masterdaos-stack/pmdk:2.1-to-masterCopy head branch name to clipboard