Add more test categories
Merge branch '904' of https://github.com/ogail/azure-sdk-tools into 904

Conflicts:
	build.proj