fix scenario with properties with bean name
(cherry-picked from 88be65c)