Errors during upgrade IdP 2.4.0 to 3.1.1

[Rod Widdowson]

> Please confirm whether our changes are correct so that we can go ahead 

At a quick glance yes.  But you are making it terribly hard for yourself, it appears that you decided to not do an in place upgrade (which would have done most of this work for you).

The idea is that you get this working and then make piecewise changes to your resolver and rep file and test at each stage.

Rod