Quick fix for cfcreate and cf modify not working. 

These commands would generate a KeyError for 'Origin'. (Bug 3536626)

Update the geranted config output to use S3Origin and DNSName
instead of just Origin. Note that this has not been tested for
custom origins.

I'm not sure if this fix is good enough to be pulled, but figured it could start a discussion.