Added check for aws credentials option is set or not. Should work with roles from now.
Merge remote-tracking branch 'origin/master'