Merge changes I9eb1a3e2,I212e61d2
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 20 Nov 2018 17:27:18 +0000 (18:27 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Tue, 20 Nov 2018 17:27:18 +0000 (18:27 +0100)
* changes:
  Bug fix in stage 3 related to repo_base_url
  hackfest_basic_vnfd: added alternative-image for aws


Trivial merge