Merge "avoid <bean factory-ref/method> in lldp-speaker's BP XML"