Paralympic champion Oscar Pistorius will face two more gun charges when he stands trial over the alleged murder of his girlfriend Reeva Steenkamp.