Toolset directory reorganization
Merge remote-tracking branch 'origin/toolset-reorganization' into facorreia/azure
Azure: toolset directory reorganization