Initial work on SCI-637
Merge branch 'master' of git@github.com:DawnScience/dawn-common.git

Conflicts:
	org.dawb.common.services/src/org/dawb/common/services/IPersistentFile.java
	org.dawnsci.persistence/src/org/dawnsci/persistence/internal/PersistentFileImpl.java
Merge branch 'master' of git@github.com:DawnScience/dawn-common.git