[Explore|Trunk]
Merge into trunk branch angular7 rev 55729
Clean up uoa-services-portal/trunk
Adding the portal version that uses the uoa-services-library