Fix the merge of GpuDnnConv* by enabling again the merge of GpuAllocEmpty and fix the inplace by duplicating them in the inplace opt