Cosmetic changes in executions v2 controller and tests

Change-Id: I9c2e1dbbd6dc9ec8d769added81e34c08205c5de
Merge "Cosmetic changes in executions v2 controller and tests"