WADL clean-up -

Some WADLs are missing the {tenant_id}, so I added it.
Some WADLs had misplaced request parameters, so I moved them.

Change-Id: Ia6d546db7386acb0add2fce7bc258a1e05c6ae0c
author: diane fleming
Merge "WADL clean-up -"