Added SQL to remove obsolete remoteentityid columns to upgrade
Merge branch 'master' into develop