Fixing workflow handlers to return all possible commands

Change-Id: I0f2f7746d7071c5eded30e75e41e80dfbe792af7
Merge "Fixing workflow handlers to return all possible commands"