Merge changes I9eb1a3e2,I212e61d2

* changes:
  Bug fix in stage 3 related to repo_base_url
  hackfest_basic_vnfd: added alternative-image for aws