DELTASPIKE-599 improvement for bean-discovery-mode annotated