Linac4 H- source R&D: Cusp free ICP and magnetron discharge