Made destroy always scrub_data.
Changed scrub_data to use provider config value.
Merge pull request #9515 from grayj/develop

Made destroy always scrub_data.