Sync some changes from slaves' ks files

Closes-bug: #1258244

Change-Id: Idf707b1b838b9439959f7ca7d81bdaed2f3dca87
Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Merge "Sync some changes from slaves' ks files"