fix merge.py merge feature - don't do it if a non-existent pkg has been specified
Merge branch 'master' of git.funtoo.org:funtoo-overlay
reduce egencache jobs from 12 to 4 to reduce IO load on container