FLUID-5067: Ability to index material held in grade defaults records
Merge branch 'master' into FLUID-5067
Merge remote-tracking branch 'amb26/FLUID-5067'

* amb26/FLUID-5067:
  FLUID-5067: Ability to index material held in grade defaults records
Merge branch 'master' into FLUID-4907