Allow chef client name and key to be overridden for cookbook uploads

This pull request provides the same fix for the master branch that was pulled into the 2-0-stable branch by https://github.com/RiotGames/berkshelf/pull/817