Corrects a typo, checks that the number of dates and the number of values are...

Corrects a typo, checks that the number of dates and the number of values are equal, Warns instead of reporting an error if the basic_plan is applied on a shock that is used in a flip_plan (flip_plan has the higher priority)
(cherry picked from commit 4dc21b48)