Merge "Enable ci off-line deployment" into stable/colorado
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Mon, 26 Sep 2016 16:50:00 +0000 (16:50 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 26 Sep 2016 16:50:00 +0000 (16:50 +0000)

Trivial merge