Fixed cli for root enabled

Change-Id: I48e08c15709c51e8112f41cec390dd0e73864f28
Fixes: bug #1216135
Merge "Fixed cli for root enabled"