Merge "Update sdc test and vagrant conf"