Effort to tackle https://issues.jenkins-ci.org/browse/JENKINS-26059 to expand var during conditional
Further expanding vars, don't forget appId
Update to check empty string since vars.expand() doesn't return null
Merge pull request #27 from Brantone/master

Expand vars for null check.