Supermarket pr

Remove deprecated opscode endpoint. Use supermarket instead.
Please note this PR includes previous PRs.