MB-9169:  move web service over to "factory" again

Change-Id: I1996314dcff3d63d573c956a8e10283c27d66965