Apply second patch from HARMONY-4159: ([testing] EHWA scenario improvement)
Apply second patch from HARMONY-4159:
([testing] EHWA scenario improvement)

svn path=/harmony/enhanced/buildtest/branches/2.0/; revision=548222

freeVM/freeVM,freeVM/freeVM,freeVM/freeVM,freeVM/freeVM,freeVM/freeVM