fixes #5086
Merge remote-tracking branch 'origin/master' into issue-5086-unable-to-edit-content-after-push-publish-due-to-archived-references
fixes #5086 including junit test
fixes #5086 fixed error in junit test
Merge pull request #5218 from dotCMS/issue-5086-unable-to-edit-content-after-push-publish-due-to-archived-references

Issue 5086 unable to edit content after push publish due to archived references