Added new options to aws provider config. Fixed path to salt master key.