Return pillar data if not external pillar data

Pillar data should be returned if there is no external pillar data.

The ext_pillar function merge pillar and external-pillar data if any.
So, if there is no external-pillar data (or errors), the function should return pillar.

This commit resolv issue #16210.