update extension to support all versions (rather than attempt to cherry-pick changes back). Some improvements

This commit makes it so that 'master' can actually support 4.2, 4.3 & 4.4 - per my email I think this is an easier way forward at this point than merging & updating  the current branches which are not in sync.