Merge changes from topic 'fix-amsterdam' into release-1.1.0
authorMike Elliott <mike.elliott@amdocs.com>
Fri, 1 Dec 2017 15:59:54 +0000 (15:59 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 1 Dec 2017 15:59:54 +0000 (15:59 +0000)
* changes:
  Fix ONAP entity-event-policy.xml bean package
  Fix docker image name for AAI
  Output the Robot logs at the proper place


Trivial merge