merged iishelper from develop

I had to do some interesting partial cherrypicking to avoid pulling across the fake.deploy stuff. Can you sanity check it before pulling in? Thanks