Fix a couple issues with cyclic features and dev-dependencies#10103

bors merged 2 commits intorust-lang:masterrust-lang/cargo:masterfrom

ehuss:tree-cycleehuss/cargo:tree-cycleCopy head branch name to clipboard