Refactoring getting feature request urls

This refactoring brings together two functions which previously were separate but can now be shared. This will make upcoming work to remove some existing functionality easier.
Why createSpy('getWfsLayerFeatureRequestUrl')?
I think you meant to change this?