Combined effects of electronic trapping and non-thermal electrons on the expansion of laser produced plasma into vacuum