Reimplement masterData-config location - fix ALV-664