changes for issue 1787

for review and test, I suspect that some of the cases below will never be hit.
there's more work needed likely on the UI which I haven't done. 
Also the HttpProxy probably doesn't need both secure and non secure bootstraps when in this mode
so likely more work needed but sent for early review.