r8832: changes for allow import of clsql and clsql-usql in the same package