Merge upstream sabermod

It was less about https and more about using Linux-manifest instead of Linux_manifest