Merge "Several orchestration fixes"
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Wed, 24 Feb 2016 14:10:44 +0000 (14:10 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 24 Feb 2016 14:10:44 +0000 (14:10 +0000)

Trivial merge