DC2b-33: AAF integration

Change url from tomcat port to apache without 8080
Merge branch 'master' of github.com:IntersectAustralia/aodn-portal