CF-55 - Merge wadls

- updating xslt & tests to support single wadl for service-admin and observer apis