Configure novav3 service only if v3 endpoing is enabled

Change-Id: Ib229ec381c8baf8c9f90652eddc30ce9fd5a4ace
Merge "Configure novav3 service only if v3 endpoing is enabled"