Hide v1/v2 version entities in API when disabled

Fixes bug 1181413

Change-Id: Ia8aaa78a0e0d222c268e9ca780816eb1c26feb3f
Merge "Hide v1/v2 version entities in API when disabled"