#976 - Address ordering of property file consumption such that implementation shared and regular property files are last, behind any external property override file.
(cherry picked from commit 9f01bd6)
Merge remote-tracking branch 'origin/BroadleafCommerce-3.1.x' into develop