Refactor VaadinFinderLocatorStrategy

Change-Id: I9a3b3087f49f65e6ee0733fab42573d2b84c188e