v3 endpoint set shouldn't always need service option

Change-Id: I71aab1ee4f467dc963e7afa7fc1c82b4255ea822
Closes-Bug: #1351121
Merge "v3 endpoint set shouldn't always need service option"