(maint) Don't test agent on the master for Win/Sol

Windows and Solaris Beaker configs currently test the 'agent' role on
the master, typically an EL 6 or EL 7 machine. This leads to
double-testing, since we already test these platforms elsewhere.

This commit removes the 'agent' role from the master for Windows and
Solaris Beaker configs to speed up testing and reduce false positives
for these agent platforms.
Merge pull request #3413 from rji/maint/stable/remove-agent-role-from-master-win-sol

(maint) Don't test agent on the master for Win/Sol
Merge remote-tracking branch 'upstream/stable'

* upstream/stable:
  (maint) Don't test agent on the master for Win/Sol

Conflicts:
	acceptance/config/nodes/solaris10.yaml
	acceptance/config/nodes/solaris11.yaml
	acceptance/config/nodes/win2003r2x64-rubyx64.yaml
	acceptance/config/nodes/win2003r2x64-rubyx86.yaml
	acceptance/config/nodes/win2003r2x86-rubyx86.yaml
	acceptance/config/nodes/win2003x64-rubyx64.yaml
	acceptance/config/nodes/win2003x64-rubyx86.yaml
	acceptance/config/nodes/win2003x86-rubyx86.yaml
	acceptance/config/nodes/win2008-rubyx64.yaml
	acceptance/config/nodes/win2008-rubyx86.yaml
	acceptance/config/nodes/win2008r2-rubyx64.yaml
	acceptance/config/nodes/win2008r2-rubyx86.yaml
	acceptance/config/nodes/win2012-rubyx64.yaml
	acceptance/config/nodes/win2012-rubyx86.yaml
	acceptance/config/nodes/win2012r2-rubyx64.yaml
	acceptance/config/nodes/win2012r2-rubyx86.yaml