Logic optimization for wfExpandUrl()

removed redundant checks of the same variable, making the code
slightly more efficient

Change-Id: Ice4d3c45e80ca1214e2c36444baf0ce87b15a59b
Merge "Logic optimization for wfExpandUrl()"