FLUID-5246: Fix and test case for static grade linkage issue

@yzen: This should allow the https://github.com/GPII/universal/pull/121/files pull to go ahead