Switch away from using 'prefix' attribute of @ConditionalOnProperty

Using `prefix` isn't necessary any more and we can simply combine the `prefix` and the `name` attributes. In a lot of cases this will result in us being able to use the simplified form of the annotation.