Temporary UKMO branch of dev_merge_2017 to implement datestamping of restart files and extra mixing options.