[ARCH] Updated bootstrap to 2.3.1 and less to 1.3.3 (needed for bootstrap)

This supersedes #3672.
@gruehle i tried rebasing but there were to many rebasing conflicts for it to work properly so i just merged with master.