Move config file back into the repository

Change-Id: I1c55fe8cd22e101fe2dade9adb3d2f879506d534