As far as I know, this is still the case. Though, often times, people will still change their minds up through the 2nd year and last minute juggling will occur.
However, I did hear a rumor that HJD is considering the possiblity of instituting a separate 6 year match for their 2 spots in the future, so keep that in mind...
