Merge changes I36641bbb,Ia8568265

* changes:
  parameterize docker image
  add service endpoint annotation for aai