Changes according new nailgun api

Change-Id: Ie801218b104d57c56a7e51aed984eb96bba22ae5
Closes-Bug: #1307968
Merge "Changes according new nailgun api"