Shuffling data.extra stuff around
Merge pull request #9785 from techhat/saltcloud

Shuffling data.extra stuff around