Merge "Add jianfei.zhang@nokia.com to the contributor(ESCALATOR-22)"