Combine manual measurement and calibration flags

[wmay]

Since the time period for measurement flags and calibration flags are often the same it makes sense to combine them into a single file.