Merge pull request #616 from john-hill/PLFM-2134

fixes for PLFM-2134 and PLFM-2135
Merge pull request #617 from john-hill/month-off

added one to months since calandar starts months at zero
Finish migration for type if failure.
Merge pull request #621 from xschildw/PLFM-2129-3

Plfm 2129 3