SSP-1042 Template fix and move to TO
SSP-1042 fix for errors in 24fa6ccff58535d245cd208354d7ac85feaaf521
SSP-2283 MovePlan allows bumps to one year in past and 8 years in future