Make sure we load ufnctions in ALL situations
Merge pull request #9598 from jacksontj/develop

Fix for pillar loading and comment update