Bug 1022763: Look for the right local instance data file r=dustin
merged from default

changeset:   2466:618af0bea0bc
tag:         tip
parent:      2464:6feb6731f424
user:        Chris AtLee <catlee@mozilla.com>
date:        Mon Nov 10 18:00:12 2014 -0500
summary:     Bug 1022763: Look for the right local instance data file r=dustin
Bug 1096470: use short service names; r=markco
Merge default -> production