Fix extracting services from deployment.description

This is the first step on fixing Environment -> Component -> Logs
(which are empty now). The second step is to fix bug #1311534.

Change-Id: I268ff8e383e406ce1d7e76d73931e66550ec1286
Partial-Bug: #1311769
Merge "Fix extracting services from deployment.description"