Bug 1022763: Look for the right local instance data file r=dustin
Bug 1096470: use short service names; r=markco