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

@gruehle finally rebased correctly.
This supersedes #3672.