Couple of rebase fixes#229

brianjmurrell wants to merge 2 commits intodaos_devel1daos-stack/cart:daos_devel1from

bmurrell/handle-new-mercurydaos-stack/cart:bmurrell/handle-new-mercuryCopy head branch name to clipboard