Add check for &#34; which is another numerical entity for ".
Add check for &#34; which is another numerical entity for ".

Also removed unnecessary check for presence before doing substitution
of double quotes and using only one regexp to do the substitution.

MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging