Return pillar data if not external pillar data

Pillar data should be returned if there is no external pillar data, in
the same manner pillar and external-pillar datas are merged.
Merge pull request #16212 from semarie/2014.1

Return pillar data if not external pillar data