Rollover date failing on multiple years

[petednz]

Scenario

Fixed date is 1 April

Rollover date is 1 July

Someone joins in Jan 2014 should have an end of Mar 31 2019

but they get Mar 31 2018

on demo example contact is here http://d45.demo.civicrm.org/civicrm/contact/view?reset=1&cid=213

here is summary of results

Start   Date  End Date   Desired End Date
3/JAN/2014   31/MAR/2018      31/MAR/2019
3/FEB/2014   31/MAR/2018      31/MAR/2019
3/MAR/2014   31/MAR/2018      31/MAR/2019
3/APR/2014   31/MAR/2019      31/MAR/2019
3/MAY/2014   31/MAR/2019      31/MAR/2019