STS-3462: autowire hyperlink detector still throws NPE in some
situations
Merge branch 'master' into getting-started