gg-7894: Fix.
# Fixed standalone POMs
Merge branch 'sprint-21' into gg-7894
# Fixed standalone POMs
Merge remote-tracking branch 'origin/sprint-21' into sprint-21
Merge remote-tracking branch 'origin/sprint-21' into sprint-21
Minor fix.