remove the requirement to set basepath.assets in server.cfg during upgrade

Change-Id: I4582b05e010154ee352e56f6fa30158c1d44651b
Merge "remove the requirement to set basepath.assets in server.cfg during upgrade" into develop