Removed local includes, switching to central ucla_search code, per DRUP-417