Re: #1610
Re #1645 Refreshing contact persons.
Re: #1447
Re #1257 Removing getParent() from mock service.
Merge branch 'master' into masterNeoMerge
Merge branch 'neo4j' into masterNeoMerge

Conflicts:
	portal2/src/main/webapp/WEB-INF/tags/displayEseDataAsHtml.tag