Move cli tests into service subdirectories

This commit takes the cli tests and moves them into service specific directories. This is 
done in lieu of using a service decorator to properly tag the test as using a particular
service. This should be less error prone then adding a decorator to each test case. It also
is useful for projects that have more than one cli interface being tested by making the grouping by service more explicit.

Partially implements bp add-service-tags

Change-Id: I54e01ba29fc03beea83f2377f6b6b98f23361f5f
Merge "Move cli tests into service subdirectories"