Import foreman-proxy
Tidy up and correct changelog