Merge "Get user id without forking a shell." into stable/brahmaputra
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Sat, 9 Apr 2016 18:14:34 +0000 (18:14 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sat, 9 Apr 2016 18:14:34 +0000 (18:14 +0000)

Trivial merge