Fix methods which needed for deployment tests

Fix method which needed for deployment tests and fix tests for
deployment linux services

Change-Id: I17bafb74baad689f07f0c18ba3ae7d77d77d76fa
Related-Bug: #1311590
Merge "Fix methods which needed for deployment tests"