Merge pull request #1113 from jmaas/release26

Don't send the Puppet environment when system status is empty (#560).