XXX: HYDRA PICKUP, DO NOT MERGE!

 * update userns patch for version 36 and higher...
 * temporarily disable mojo until we got a fix
 * remove stupid leftover from 0517041a2fc421f3efa75933e8258ae001ce21ab