Test fixes and rebase conflicts
Test fixes and rebase conflicts

bhickey/rand,arthurprs/rand,GrahamDennis/rand,shepmaster/rand,bluss/rand,achanda/rand,waynenilsen/rand,ebfull/rand,huonw/rand,retep998/rand