Update from HG changeset 9669:c5b24e8ed428
Update from HG changeset 9680:217bdd9a3ad9
Merge branch 'master' into warped

Conflicts:
	src/mem/ruby/network/garnet/BaseGarnetNetwork.hh
Tweaks to namespaces for new code