Misc cleanup#1236

rgoldberg merged 11 commits into

mas-cli:mainmas-cli/mas:mainfrom

rgoldberg:7.0.0/1235-cleanuprgoldberg/mas:7.0.0/1235-cleanupCopy head branch name to clipboard