Applied bug fix from trunk r1626462.
Applied bug fix from jira issue - OFBIZ-5261- Party contact expiration and its hidden problems.
Thanks Mridul for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1626469 13f79535-47bb-0310-9956-ffa450edef68