* Correct inconsistent use of aai-common version
* Align with ONAP version manifest:
https://git.onap.org/integration/tree/version-manifest/
src/main/resources/java-manifest.csv
* Organise for readability
Change-Id: Ie17625e0f1ad3773bcf950a937f5eed6367d4b1f
Issue-ID: AAI-1442 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>