Commits

Vailin Choi committed 7d2ddefa647
Merge fix for HDFFV-7991 from trunk to 1.18 Missed one change that should be in previous commit. Tested on mayll, platypus, osx1010test, emu, kituo, kite, quail, moohan, ostrich.
Merge fix for HDFFV-7991 from trunk to 1.18 Missed one change that should be in previous commit. Tested on mayll, platypus, osx1010test, emu, kituo, kite, quail, moohan, ostrich.