Merge branch 'develop-nao_dimension_checks' into 'master'

Modify NAO dimension check to allow 'ftime_dim' to be NULL if ftime_avg is FALSE

See merge request !180
2 jobs for dev-crpss
in 15 minutes and 9 seconds, using 0 compute credits, and was queued for 2 seconds