Updated from global requirements

Change-Id: Ibd5e12f7a33667d93e2fc99d79a11cff44c3b884
Set v2 commands available for v2 service_type

These commands originally were only available for v1, but this makes
them available for both v1 and v2 service_type.

Change-Id: I26e3f1997aebafa1eb784273c892397522dbbfe2
Closes-Bug: #1284321
Merge "Set v2 commands available for v2 service_type"