Fix conflict with pe_staging.
Merge pull request #38 from nanliu/ENTERPRISE-258

(ENTERPISE-258) Fix conflict with pe_staging.