Merge fixes from ellert-globus_6_branch
Merge remote-tracking branch 'upstream/globus_6_branch' into globus_6_branch

Conflicts:
	xio/drivers/blockz/Makefile.am