Merge "Move LocalEventLog into location dir" into sc-dev