Merge changes from eucalyptus/eutester.