FL-1505: update merge.py for experimental branch - experimental will now merge funtoo toolchain overlay, so we can test it. In all other respects, experimental is now the same as mainline.