merging FMDB discretization from master - keeping Epetra/Tpetra support