Merge changes Id420552d,I664b466e

* changes:
  Add aai docker template
  Update jenkins aai to remove goals