Stop merging in Castle facility as it is out of date
Ensure time is UTC before saving

Format was hard-coded as UTC ('Z') but was not ensuring the actual value
was UTC