Merge branch 'fix/cornerpoint-test' into 'releases/3.4'
Fix 2p cornerpoint test by including required headers
See merge request !2700 (merged)
(cherry picked from commit 1af223c9)
eccfde38 [test] fix 2p cornerpoint test by including required headers