Added env var expansion for calabash tags and junit test filter fields.
Merge remote-tracking branch 'upstream/master'