Package fixes for webservice2

Change-Id: Ic0ab8539c34c6e610424c784dfd2c887012e03d1