Merge "Added portal-FE-common -  angular upgrade code"