Merge "Rebase of ks.cfg due to upstream changes" into stable/brahmaputra
authorStefan K. Berg <stefan.k.berg@ericsson.com>
Fri, 29 Jan 2016 13:31:22 +0000 (13:31 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 29 Jan 2016 13:31:23 +0000 (13:31 +0000)

Trivial merge