Merge changes Id420552d,I664b466e
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Mon, 20 Feb 2017 20:41:12 +0000 (20:41 +0000)
committerGerrit Code Review <gerrit@openecomp.org>
Mon, 20 Feb 2017 20:41:12 +0000 (20:41 +0000)
* changes:
  Add aai docker template
  Update jenkins aai to remove goals


Trivial merge