GetCapabilities and GetMetadata requests advertise same layer styles

We (@aodn) found that the styles reported in the GetCapabilities documents were not the same as those being reported when you did a GetMetadata request for a layer. This change should mean that both requests should advertise the same supported styles for any given layer.

*NB. I've made this PR from my personal account because the forks and different branches between our versions was too messy.*