Diversify Vaadin CDI scope annotations (#14821, #14824)

Change-Id: Ic2dd5304bd48a16f545a52ad616d441f769739b5