Merge "Use org.onap.aaf dependencies"