Trump proposes path to citizenship for 1.8 M, but includes border wall