IDE-1230-2

Little modification to make sure UseDefaultLocationValidationService and
UseSdkValidationService do work.