Upgrading from Portfolio 2.x and 3.x to Portfolio 3.6.x