Upgrade from 15.4 to 15.6 Error: The link you have followed refers to a different community than the one that you are logged in to..

Hi Team,

We have recently upgraded EB form 15.4 to 15.6 and this caused an errors that seems to be common after upgrade.  Clicking on EB generated E-mail link or at Check out , Give the error message attached : "The link you have followed refers to a different community than the one that you are logged in to.." . We are basically getting the same error message as mentioned in the links below even though the Data source and the community have the same name. I read through the work around but is there and fix for this bug please?

Thanks