Add some if logic to prevent barfing on empty strings in a loop
Merge branch 'master' of https://github.com/apache/infra-puppet