FLUID-5246: Fix and test case for static grade linkage issue
Merge remote-tracking branch 'amb26/FLUID-5246'

* amb26/FLUID-5246:
  FLUID-5246: Fix and test case for static grade linkage issue
FLUID-5246: removed whitespace in files modified for FLUID-5246.