Merge remote-tracking branch 'amb26/FLUID-4939'

* amb26/FLUID-4939:
  FLUID-4939: Corrected double merging of own default options introduced by fix to FLUID-4937
  FLUID-4939: test case
FLUID-4939: test case for circular grades.

Added a test case that shows the issue when a component adds a grade, that also contained the component itself as a grade. The init functions here are also fired multiple times.
FLUID-4939: Fix for fresh test case involving circular grade references (which previously had undefined behaviour status), some linting