Merge changes I6a64e620,I72e7501b,I3d61c55b

* changes:
  Refactors VABModelProvider
  Removes list references
  Fixes AASServer component pom.xml