Merge branch 'gc-fix-context' into 'master'

Fix spring context for GC baremetal

See merge request !401 (merged)

(cherry picked from commit 01d870e8)

ed3ba6d4 exclude partition based config bean