CF-55 - Merge wadls

- updating xslt & tests to support single wadl for service-admin and observer apis
Merge pull request #8 from usnavi/CF-55_merge

CF-55 - Merge wadls