Merged revision(s) 10280-10283 from branches/Release/17_1: Fix error when waveHeight is null. Related to WTI-1329 ........ Fixed failing tests. Related to WTI-1329
........ Made waveHeight not visible in property control when it's NaN. Related to WTI-1329